diff --git a/pkg/influxunifi/usg.go b/pkg/influxunifi/usg.go
index 57fdad4f..74add993 100644
--- a/pkg/influxunifi/usg.go
+++ b/pkg/influxunifi/usg.go
@@ -45,6 +45,7 @@ func (u *InfluxUnifi) batchUSG(r report, s *unifi.USG) {
 		"lan-rx_packets":                 s.Stat.Gw.LanRxPackets.Val,
 		"lan-tx_bytes":                   s.Stat.Gw.LanTxBytes.Val,
 		"lan-tx_packets":                 s.Stat.Gw.LanTxPackets.Val,
+		"lan-rx_dropped":                 s.Stat.Gw.LanRxDropped.Val,
 	}, u.batchSysStats(s.SysStats, s.SystemStats))
 	r.send(&metric{Table: "usg", Tags: tags, Fields: fields})
 	u.batchNetTable(r, tags, s.NetworkTable)
@@ -105,6 +106,7 @@ func (u *InfluxUnifi) batchUSGwans(r report, tags map[string]string, wans ...uni
 			"rx_bytes-r":   wan.RxBytesR.Val,
 			"rx_dropped":   wan.RxDropped.Val,
 			"rx_errors":    wan.RxErrors.Val,
+			"rx_broadcast": wan.RxBroadcast.Val,
 			"rx_multicast": wan.RxMulticast.Val,
 			"rx_packets":   wan.RxPackets.Val,
 			"speed":        wan.Speed.Val,
@@ -113,6 +115,8 @@ func (u *InfluxUnifi) batchUSGwans(r report, tags map[string]string, wans ...uni
 			"tx_dropped":   wan.TxDropped.Val,
 			"tx_errors":    wan.TxErrors.Val,
 			"tx_packets":   wan.TxPackets.Val,
+			"tx_broadcast": wan.TxBroadcast.Val,
+			"tx_multicast": wan.TxMulticast.Val,
 		}
 		r.send(&metric{Table: "usg_wan_ports", Tags: tags, Fields: fields})
 	}
diff --git a/pkg/promunifi/uap.go b/pkg/promunifi/uap.go
index ed8507df..676e3ad3 100644
--- a/pkg/promunifi/uap.go
+++ b/pkg/promunifi/uap.go
@@ -152,16 +152,16 @@ func descUAP(ns string) *uap {
 		RadioTxPower:            prometheus.NewDesc(ns+"radio_transmit_power", "Radio Transmit Power", labelR, nil),
 		RadioAstBeXmit:          prometheus.NewDesc(ns+"radio_ast_be_xmit", "Radio AstBe Transmit", labelR, nil),
 		RadioChannel:            prometheus.NewDesc(ns+"radio_channel", "Radio Channel", labelR, nil),
-		RadioCuSelfRx:           prometheus.NewDesc(ns+"radio_channel_utilization_receive", "Radio Channel Utilization Receive", labelR, nil),
-		RadioCuSelfTx:           prometheus.NewDesc(ns+"radio_channel_utilization_transmit", "Radio Channel Utilization Transmit", labelR, nil),
-		RadioCuTotal:            prometheus.NewDesc(ns+"radio_channel_utilization_total", "Radio Channel Utilization", labelR, nil),
+		RadioCuSelfRx:           prometheus.NewDesc(ns+"radio_channel_utilization_receive_percent", "Radio Channel Utilization Receive", labelR, nil),
+		RadioCuSelfTx:           prometheus.NewDesc(ns+"radio_channel_utilization_transmit_percent", "Radio Channel Utilization Transmit", labelR, nil),
+		RadioCuTotal:            prometheus.NewDesc(ns+"radio_channel_utilization_percent", "Radio Channel Utilization", labelR, nil),
 		RadioExtchannel:         prometheus.NewDesc(ns+"radio_ext_channel", "Radio Ext Channel", labelR, nil),
 		RadioGain:               prometheus.NewDesc(ns+"radio_gain", "Radio Gain", labelR, nil),
 		RadioGuestNumSta:        prometheus.NewDesc(ns+"radio_guest_stations", "Radio Guest Station Count", labelR, nil),
 		RadioNumSta:             prometheus.NewDesc(ns+"radio_stations", "Radio Total Station Count", labelR, nil),
 		RadioUserNumSta:         prometheus.NewDesc(ns+"radio_user_stations", "Radio User Station Count", labelR, nil),
-		RadioTxPackets:          prometheus.NewDesc(ns+"radio_transmit_packets_total", "Radio Transmitted Packets", labelR, nil),
-		RadioTxRetries:          prometheus.NewDesc(ns+"radio_transmit_retries_total", "Radio Transmit Retries", labelR, nil),
+		RadioTxPackets:          prometheus.NewDesc(ns+"radio_transmit_packets", "Radio Transmitted Packets", labelR, nil),
+		RadioTxRetries:          prometheus.NewDesc(ns+"radio_transmit_retries", "Radio Transmit Retries", labelR, nil),
 	}
 }
 
diff --git a/pkg/promunifi/usw.go b/pkg/promunifi/usw.go
index a02b15f4..350c3b05 100644
--- a/pkg/promunifi/usw.go
+++ b/pkg/promunifi/usw.go
@@ -176,6 +176,7 @@ func (u *promUnifi) exportPortTable(r report, labels []string, pt []unifi.Port)
 			{u.USW.TxDropped, prometheus.CounterValue, p.TxDropped, labelP},
 			{u.USW.TxErrors, prometheus.CounterValue, p.TxErrors, labelP},
 			{u.USW.TxMulticast, prometheus.CounterValue, p.TxMulticast, labelP},
+			{u.USW.TxPackets, prometheus.CounterValue, p.TxPackets, labelP},
 		})
 	}
 }