Fixed many Controller errors