Changes for 64-bit compatibility