#4137 Minor code tidy
#4137 Getting MVC running again