Changes to support MrGeo build