Final, final, tweaks