Still more tweaks