add fixups for task copy