Fixed references to view model classes in some views