More 64bit fixes