diff --git a/state.go b/state.go
index 13def7c..e0f2822 100644
--- a/state.go
+++ b/state.go
@@ -99,7 +99,7 @@ func (s *State) Send() error {
 	output.SetAdvisorySpeed(float32(advisorySpeed))
 
 	output.SetNextAdvisorySpeed(s.NextAdvisorySpeed.Value)
-	output.SetNextHazardDistance(s.NextAdvisorySpeed.Distance)
+	output.SetNextAdvisorySpeedDistance(s.NextAdvisorySpeed.Distance)
 
 	oneWay := s.CurrentWay.Way.OneWay()
 	output.SetOneWay(oneWay)
@@ -119,6 +119,7 @@ func (s *State) Send() error {
 	output.SetDistanceFromWayCenter(float32(s.CurrentWay.OnWay.Distance.Distance))
 
 	output.SetWaySelectionType(s.CurrentWay.SelectionType)
+	output.SetSpeedLimitAccepted(ms.Settings.SpeedLimitAccepted())
 
 	return s.Publisher.Send(msg)
 }