Fix connections - need more fixes