udp gateway fixes