Another mapping fixes...