more early run abort changes