Fixed some 32-bit stuff