add in some 64-bit fixes