minor mapping fixes