Fix 64-bit test build failures