Fix quality flaws and coverage