Tweaks on the controller