Fixed bugs from adding controllers