x64_heap builds again