Few changes to uniform everything