Made more consistency fixes with unsigned long int.