Fix initial connectivity