Add a couple of missing deps
Fix the clean targets