Fix controllers to match models