Several fixes for nested retry and logging
Fix for failed job sometimes rechecked