Some mapping fixes.