Yet still more tweaks