Pre-1.7 misc. fixes (Waiting for 1.7.2 MCP update)