Update MCP conf to latest.
Fix some compile errors and remove some unneeded diffs.