Made a few changes to account for differences between 64-bit Linux and 32-bit Windows.