Fixed some rerun-on-error issues.