Fix breaking changes from MVC