fix issues reported