Small quality fixes