fixes for the abort functionality