Continue to fix GeoModel.