Fixed Disconnect and delays