Fine tweaks