Fix more things, use sctp