Fixing uint -> ulong
Merging.