Added missing disconnect() calls