[PD] 0.38 test 2 source (64 bit fixes)