More view model fixes