Fixes for MCP for 1.5.2