Fixed some remaining mcp mapping issues