[FIXUP] Makefile: correct clean targets and fix a few other small things