Improve agent recovery after restarts