More updates to reflect the latest server state.