Fixed, both here and a bunch of other places where TCP was placed after UDP