Some more tweaks for #5050