Some fixes for serialized tasks.