more halt-on-error fixes