more tweaks #10602