Few fixes for reconnectability