Tweaks to controller