robustness improvements to MCP2