Some quality fixes