64-bit cleanup