Fix mcp mapping bug and switched to nodoc mappings