Clean task fixes.