CB-957 64 bit improvements