Fix quality issues