Minor improvements to clean targets