Fixed 64 bit fixes