Added connection fixes