diff --git a/status/set.go b/status/set.go
index ff283200..ac32e781 100644
--- a/status/set.go
+++ b/status/set.go
@@ -58,7 +58,7 @@ func SetPortmasterStatus(pmStatus uint8, msg string) {
 
 		go status.Save()
 	default:
-		log.Errorf("status: tried to set portmaster to invalid status: %d", status)
+		log.Errorf("status: tried to set portmaster to invalid status: %d", pmStatus)
 	}
 }
 
@@ -75,7 +75,7 @@ func SetGate17Status(g17Status uint8, msg string) {
 
 		go status.Save()
 	default:
-		log.Errorf("status: tried to set gate17 to invalid status: %d", status)
+		log.Errorf("status: tried to set gate17 to invalid status: %d", g17Status)
 	}
 }
 
diff --git a/status/status.go b/status/status.go
index 547f3b6c..38b4633e 100644
--- a/status/status.go
+++ b/status/status.go
@@ -20,6 +20,7 @@ func init() {
 }
 
 // SystemStatus saves basic information about the current system status.
+//nolint:maligned // TODO
 type SystemStatus struct {
 	record.Base
 	sync.Mutex