Fix controller errors