FW-17 fixing udp handling minor bugs