Fix some quality issues