Minor tweaks for controllers