KNF.
repair some KNF missed by the script; ok jsing