Adding missing items from previous commit