Resolving some quality issues