Final fixes to runButton logic