Fixes for running under 64-bit linux.