Make some changes to the controller mappings