Updates for issues reported by Jas