More quality fixes