connection fixes