More quality fixes.