Correct some errors in current API and MCP