Fixed some controllers that still were using