Connection restoration, bug fixes.