more connection fixes