Updates for minor issues reported by Jas