Fixes for the controller and handler