[m] Finished 64Bit fixes