Fix for 64-bit build compatibility