Fix 64-bit only warnings