Preliminary 32 bit support