Geomap: Cleaned up various build-related issues