Fixing some compile errors in MCP.