more 64 bit fixes