- more connection fixes