More changes to make compile.  Mainly fixes related to 64-bit.