Fixing compiler errors by updating to new model types.