fixes for aborted runs