Fix some rules broken by typos, others by the flattening of the makefile.