Resolved server recovery issues