A number of chagnes that got missed in the previous commit