More mapping fixes