Remaining tweaks