32 bit stuff fixed