Fixed remaining view model object errors