Actually fix 64-bit builds