More 64-bit test issues corrected