Added some missing items from the previous commit