Geomapping fixes