Fixing clean and watch tasks