Fixed issues with controller not loading.