fix code to be 64 bit clean