Minor mapping fixes