More TCP/UDP detection fixes.