Address review comments, akwats add to failedExecutors