Update for 1.6.2 and MCP 8.04