Changes to get GeoMACH working on flux