A few more changes to MappingGate