Some more tweaks ...