fixed minor bugs with recent Mapping<> code