Updates for 64 bit compatibility (WIP)