Fixes to allow building with new uint64 forces