Fix 64-bit builds - please verify