reconnect bug fixes