Some minor changes for ControllerGenerator