MVC-74 and a small fix.