Updates for issues reported by Jas and client