fix some rt cleanup and failure edge cases

Like the other alert