#741: #726: more tweaks

opened by thuchacz