Fix some quality flaws.