Minor changes. No more redundant disconnect requests.