Fixing a couple of CNF generators