Fix quality flaw
Fix some quality flaws