Fixes needed to make first test of simp-comp excludes pass ISSUE=6258
Fixes needed to make first test of simp-comp excludes pass ISSUE=6258

GlobalNOC/simp,GlobalNOC/simp,GlobalNOC/simp,GlobalNOC/simp,GlobalNOC/simp