Fixes for 64-bit compilation.