More 64-bit compilation fixes