Corrected some 64-bit incompatibilities.  Not complete yet.