Got rid of some compiler warnings (field X will be initialized after field Y and a missing cast to unsigned int)