Fix to help ulex with connections when buffer isn't filled (and fix merge)