some minor fixes on MappingEV3