Fix initial-connect buffer fill ordering