Fix sloppy redesign of controllers