Control tweaks