connection fixes
connection fixes merged