Several fixes in MVC