More 64-bit compile fixes.