More execution factory fixes