Added items missing from previous commits