model mapping fixes