additional fixes for viewmodels