minor adjustments for multiple connections