fix some rt cleanup and failure edge cases

"already-pushed sink"?