Decompilation, FF cleanup and MCP patches