Reconciliation fixes

@drexin @guenter
If we remove this we'll end up with orphaned tasks. We should retry the task tracker call.