Fix for quality issues reported