Try 64 bit fixes