Fix 64-bit builds, again