viewToModel fixes