More 1.6.4 mapping fixes