Fix qualify flaws