Some minor tweaks to the controller