Fix minor quality flaws