Merge pull request #1163 from AerisG222/more_mvc_fixes