Fix issues reported by client