Cancel controller fixes