more nodelist repairs for concurrency issues