Stability improvements for rollback