Clean up 64-bit warnings