Fixing some view model mapping issues.