Bug fixes to the abandoning