[PD-dev] x86_64 fixes