Server recovery is now a bit more reliable (still needs more work)