Better fix for the UINT_64 errors.