Updates for small issues reported by client