Fix issues with MAKE-CLEAN-PARTS