diff --git a/src/include/containers/List.hpp b/src/include/containers/List.hpp
index f30ceaa964..543b64d89b 100644
--- a/src/include/containers/List.hpp
+++ b/src/include/containers/List.hpp
@@ -53,7 +53,7 @@ public:
 	ListNode &operator=(ListNode &&) = delete;
 
 	void setSibling(T sibling) { _sibling = sibling; }
-	T getSibling() { return _sibling; }
+	const T getSibling() { return _sibling; }
 
 protected:
 	T _sibling;
@@ -78,7 +78,7 @@ public:
 		_head = newNode;
 	}
 
-	T getHead() { return _head; }
+	const T getHead() { return _head; }
 
 protected:
 	T _head;
diff --git a/src/lib/controllib/BlockDelay.hpp b/src/lib/controllib/BlockDelay.hpp
index e6049b0ff9..d7ba6d13da 100644
--- a/src/lib/controllib/BlockDelay.hpp
+++ b/src/lib/controllib/BlockDelay.hpp
@@ -65,9 +65,8 @@ public:
 		_h(),
 		_index(0),
 		_delay(-1)
-	{
-	};
-	virtual ~BlockDelay() {};
+	{}
+	virtual ~BlockDelay() {}
 	matrix::Matrix<Type, M, N> update(const matrix::Matrix<Type, M, N> &u)
 	{
 		// store current value
diff --git a/src/lib/controllib/BlockDerivative.hpp b/src/lib/controllib/BlockDerivative.hpp
index 793f67177c..e7879c3dd2 100644
--- a/src/lib/controllib/BlockDerivative.hpp
+++ b/src/lib/controllib/BlockDerivative.hpp
@@ -67,8 +67,8 @@ public:
 		_u(0),
 		_initialized(false),
 		_lowPass(this, "LP")
-	{};
-	virtual ~BlockDerivative() {};
+	{}
+	virtual ~BlockDerivative() {}
 
 	/**
 	 * Update the state and get current derivative
diff --git a/src/lib/controllib/BlockHighPass.hpp b/src/lib/controllib/BlockHighPass.hpp
index 80763c8173..5c6ca75fab 100644
--- a/src/lib/controllib/BlockHighPass.hpp
+++ b/src/lib/controllib/BlockHighPass.hpp
@@ -68,8 +68,8 @@ public:
 		_u(0),
 		_y(0),
 		_fCut(this, "") // only one parameter, no need to name
-	{};
-	virtual ~BlockHighPass() {};
+	{}
+	virtual ~BlockHighPass() {}
 	float update(float input);
 // accessors
 	float getU() {return _u;}
diff --git a/src/lib/controllib/BlockIntegral.hpp b/src/lib/controllib/BlockIntegral.hpp
index f64f7791c5..1c4c001ab8 100644
--- a/src/lib/controllib/BlockIntegral.hpp
+++ b/src/lib/controllib/BlockIntegral.hpp
@@ -63,8 +63,8 @@ public:
 	BlockIntegral(SuperBlock *parent, const char *name) :
 		SuperBlock(parent, name),
 		_y(0),
-		_limit(this, "") {};
-	virtual ~BlockIntegral() {};
+		_limit(this, "") {}
+	virtual ~BlockIntegral() {}
 	float update(float input);
 // accessors
 	float getY() {return _y;}
diff --git a/src/lib/controllib/BlockIntegralTrap.hpp b/src/lib/controllib/BlockIntegralTrap.hpp
index 0dd6515245..43d753629f 100644
--- a/src/lib/controllib/BlockIntegralTrap.hpp
+++ b/src/lib/controllib/BlockIntegralTrap.hpp
@@ -71,8 +71,8 @@ public:
 		SuperBlock(parent, name),
 		_u(0),
 		_y(0),
-		_limit(this, "") {};
-	virtual ~BlockIntegralTrap() {};
+		_limit(this, "") {}
+	virtual ~BlockIntegralTrap() {}
 	float update(float input);
 // accessors
 	float getU() {return _u;}
diff --git a/src/lib/controllib/BlockLimit.hpp b/src/lib/controllib/BlockLimit.hpp
index 992611ead4..37f1837981 100644
--- a/src/lib/controllib/BlockLimit.hpp
+++ b/src/lib/controllib/BlockLimit.hpp
@@ -68,8 +68,8 @@ public:
 		Block(parent, name),
 		_min(this, "MIN"),
 		_max(this, "MAX")
-	{};
-	virtual ~BlockLimit() {};
+	{}
+	virtual ~BlockLimit() {}
 	float update(float input);
 // accessors
 	float getMin() { return _min.get(); }
diff --git a/src/lib/controllib/BlockLimitSym.hpp b/src/lib/controllib/BlockLimitSym.hpp
index e452a46942..1f875a0ecc 100644
--- a/src/lib/controllib/BlockLimitSym.hpp
+++ b/src/lib/controllib/BlockLimitSym.hpp
@@ -67,8 +67,8 @@ public:
 	BlockLimitSym(SuperBlock *parent, const char *name) :
 		Block(parent, name),
 		_max(this, "MAX")
-	{};
-	virtual ~BlockLimitSym() {};
+	{}
+	virtual ~BlockLimitSym() {}
 	float update(float input);
 // accessors
 	float getMax() { return _max.get(); }
diff --git a/src/lib/controllib/BlockLowPass.hpp b/src/lib/controllib/BlockLowPass.hpp
index fee7467fa3..73f2a51dc5 100644
--- a/src/lib/controllib/BlockLowPass.hpp
+++ b/src/lib/controllib/BlockLowPass.hpp
@@ -67,8 +67,8 @@ public:
 		Block(parent, name),
 		_state(0.0f / 0.0f /* initialize to invalid val, force into is_finite() check on first call */),
 		_fCut(this, "") // only one parameter, no need to name
-	{};
-	virtual ~BlockLowPass() {};
+	{}
+	virtual ~BlockLowPass() {}
 	float update(float input);
 // accessors
 	float getState() { return _state; }
diff --git a/src/lib/controllib/BlockLowPass2.hpp b/src/lib/controllib/BlockLowPass2.hpp
index bc215b5de6..9e5b18a0bc 100644
--- a/src/lib/controllib/BlockLowPass2.hpp
+++ b/src/lib/controllib/BlockLowPass2.hpp
@@ -68,8 +68,8 @@ public:
 		_fCut(this, ""), // only one parameter, no need to name
 		_fs(sample_freq),
 		_lp(_fs, _fCut.get())
-	{};
-	virtual ~BlockLowPass2() {};
+	{}
+	virtual ~BlockLowPass2() {}
 	float update(float input);
 // accessors
 	float getState() { return _state; }
diff --git a/src/lib/controllib/BlockLowPassVector.hpp b/src/lib/controllib/BlockLowPassVector.hpp
index fb5f0ba7ca..c35aeaaa2e 100644
--- a/src/lib/controllib/BlockLowPassVector.hpp
+++ b/src/lib/controllib/BlockLowPassVector.hpp
@@ -69,8 +69,8 @@ public:
 		for (int i = 0; i < M; i++) {
 			_state(i) = 0.0f / 0.0f;
 		}
-	};
-	virtual ~BlockLowPassVector() {};
+	}
+	virtual ~BlockLowPassVector() {}
 	matrix::Vector<Type, M> update(const matrix::Matrix<Type, M, 1> &input)
 	{
 		for (int i = 0; i < M; i++) {
diff --git a/src/lib/controllib/BlockOutput.hpp b/src/lib/controllib/BlockOutput.hpp
index 1feaa8ec88..348c4d580f 100644
--- a/src/lib/controllib/BlockOutput.hpp
+++ b/src/lib/controllib/BlockOutput.hpp
@@ -68,8 +68,9 @@ public:
 		_val(0)
 	{
 		update(0);
-	};
-	virtual ~BlockOutput() {};
+	}
+
+	virtual ~BlockOutput() {}
 	void update(float input)
 	{
 		_val = _limit.update(input + getTrim());
diff --git a/src/lib/controllib/BlockP.hpp b/src/lib/controllib/BlockP.hpp
index e751947a84..5d7282c8a5 100644
--- a/src/lib/controllib/BlockP.hpp
+++ b/src/lib/controllib/BlockP.hpp
@@ -66,8 +66,8 @@ public:
 	BlockP(SuperBlock *parent, const char *name) :
 		Block(parent, name),
 		_kP(this, "") // only one param, no need to name
-	{};
-	virtual ~BlockP() {};
+	{}
+	virtual ~BlockP() {}
 	float update(float input)
 	{
 		return getKP() * input;
diff --git a/src/lib/controllib/BlockPD.hpp b/src/lib/controllib/BlockPD.hpp
index 2992af37dd..48bccf33a6 100644
--- a/src/lib/controllib/BlockPD.hpp
+++ b/src/lib/controllib/BlockPD.hpp
@@ -68,8 +68,8 @@ public:
 		_derivative(this, "D"),
 		_kP(this, "P"),
 		_kD(this, "D")
-	{};
-	virtual ~BlockPD() {};
+	{}
+	virtual ~BlockPD() {}
 	float update(float input)
 	{
 		return getKP() * input +
diff --git a/src/lib/controllib/BlockPI.hpp b/src/lib/controllib/BlockPI.hpp
index e352d0ffcf..68ccb6fd01 100644
--- a/src/lib/controllib/BlockPI.hpp
+++ b/src/lib/controllib/BlockPI.hpp
@@ -68,8 +68,8 @@ public:
 		_integral(this, "I"),
 		_kP(this, "P"),
 		_kI(this, "I")
-	{};
-	virtual ~BlockPI() {};
+	{}
+	virtual ~BlockPI() {}
 	float update(float input)
 	{
 		return getKP() * input +
diff --git a/src/lib/controllib/BlockPID.hpp b/src/lib/controllib/BlockPID.hpp
index 4c26796866..40bebd917d 100644
--- a/src/lib/controllib/BlockPID.hpp
+++ b/src/lib/controllib/BlockPID.hpp
@@ -70,8 +70,8 @@ public:
 		_kP(this, "P"),
 		_kI(this, "I"),
 		_kD(this, "D")
-	{};
-	virtual ~BlockPID() {};
+	{}
+	virtual ~BlockPID() {}
 	float update(float input)
 	{
 		return getKP() * input +
diff --git a/src/lib/controllib/BlockRandGauss.hpp b/src/lib/controllib/BlockRandGauss.hpp
index f38764a6bc..813ac535f9 100644
--- a/src/lib/controllib/BlockRandGauss.hpp
+++ b/src/lib/controllib/BlockRandGauss.hpp
@@ -68,8 +68,8 @@ public:
 		// seed should be initialized somewhere
 		// in main program for all calls to rand
 		// XXX currently in nuttx if you seed to 0, rand breaks
-	};
-	virtual ~BlockRandGauss() {};
+	}
+	virtual ~BlockRandGauss() {}
 	float update()
 	{
 		static float V1, V2, S;
diff --git a/src/lib/controllib/BlockRandUniform.hpp b/src/lib/controllib/BlockRandUniform.hpp
index cbb0603776..5b2e88cbc0 100644
--- a/src/lib/controllib/BlockRandUniform.hpp
+++ b/src/lib/controllib/BlockRandUniform.hpp
@@ -71,8 +71,8 @@ public:
 		// seed should be initialized somewhere
 		// in main program for all calls to rand
 		// XXX currently in nuttx if you seed to 0, rand breaks
-	};
-	virtual ~BlockRandUniform() {};
+	}
+	virtual ~BlockRandUniform() {}
 	float update()
 	{
 		static float rand_max = RAND_MAX;
diff --git a/src/lib/controllib/BlockStats.hpp b/src/lib/controllib/BlockStats.hpp
index e82be2a33d..94d7643a33 100644
--- a/src/lib/controllib/BlockStats.hpp
+++ b/src/lib/controllib/BlockStats.hpp
@@ -66,9 +66,8 @@ public:
 		_sum(),
 		_sumSq(),
 		_count(0)
-	{
-	};
-	virtual ~BlockStats() {};
+	{}
+	virtual ~BlockStats() {}
 	void update(const matrix::Vector<Type, M> &u)
 	{
 		_sum += u;
diff --git a/src/lib/controllib/block/Block.hpp b/src/lib/controllib/block/Block.hpp
index 47838b4b4b..3cb7994b9e 100644
--- a/src/lib/controllib/block/Block.hpp
+++ b/src/lib/controllib/block/Block.hpp
@@ -104,7 +104,7 @@ class __EXPORT SuperBlock :
 public:
 	friend class Block;
 
-	SuperBlock(SuperBlock *parent, const char *name) : Block(parent, name) {};
+	SuperBlock(SuperBlock *parent, const char *name) : Block(parent, name) {}
 	~SuperBlock() = default;
 
 	// no copy, assignment, move, move assignment
diff --git a/src/lib/launchdetection/LaunchDetector.h b/src/lib/launchdetection/LaunchDetector.h
index 0b3e3e0bee..1c0f0122a3 100644
--- a/src/lib/launchdetection/LaunchDetector.h
+++ b/src/lib/launchdetection/LaunchDetector.h
@@ -61,7 +61,7 @@ public:
 
 	void update(float accel_x);
 	LaunchDetectionResult getLaunchDetected();
-	bool launchDetectionEnabled() { return launchdetection_on.get() == 1; };
+	bool launchDetectionEnabled() { return launchdetection_on.get() == 1; }
 
 	/* Returns a maximum pitch in deg. Different launch methods may impose upper pitch limits during launch */
 	float getPitchMax(float pitchMaxDefault);
diff --git a/src/lib/runway_takeoff/RunwayTakeoff.h b/src/lib/runway_takeoff/RunwayTakeoff.h
index a0f2289cef..b09d78fde8 100644
--- a/src/lib/runway_takeoff/RunwayTakeoff.h
+++ b/src/lib/runway_takeoff/RunwayTakeoff.h
@@ -71,15 +71,15 @@ public:
 	void init(float yaw, double current_lat, double current_lon);
 	void update(float airspeed, float alt_agl, double current_lat, double current_lon, orb_advert_t *mavlink_log_pub);
 
-	RunwayTakeoffState getState() { return _state; };
-	bool isInitialized() { return _initialized; };
+	RunwayTakeoffState getState() { return _state; }
+	bool isInitialized() { return _initialized; }
 
-	bool runwayTakeoffEnabled() { return (bool)_runway_takeoff_enabled.get(); };
-	float getMinAirspeedScaling() { return _min_airspeed_scaling.get(); };
-	float getInitYaw() { return _init_yaw; };
+	bool runwayTakeoffEnabled() { return (bool)_runway_takeoff_enabled.get(); }
+	float getMinAirspeedScaling() { return _min_airspeed_scaling.get(); }
+	float getInitYaw() { return _init_yaw; }
 
 	bool controlYaw();
-	bool climbout() { return _climbout; };
+	bool climbout() { return _climbout; }
 	float getPitch(float tecsPitch);
 	float getRoll(float navigatorRoll);
 	float getYaw(float navigatorYaw);
diff --git a/src/lib/terrain_estimation/terrain_estimator.h b/src/lib/terrain_estimation/terrain_estimator.h
index ed9e9741f3..802e464d10 100644
--- a/src/lib/terrain_estimation/terrain_estimator.h
+++ b/src/lib/terrain_estimation/terrain_estimator.h
@@ -58,11 +58,11 @@ class __EXPORT TerrainEstimator
 {
 public:
 	TerrainEstimator();
-	~TerrainEstimator() {};
+	~TerrainEstimator() {}
 
 	bool is_valid() {return _terrain_valid;}
 	float get_distance_to_ground() {return -_x(0);}
-	float get_velocity() {return _x(1);};
+	float get_velocity() {return _x(1);}
 
 	void predict(float dt, const struct vehicle_attitude_s *attitude, const struct sensor_combined_s *sensor,
 		     const struct distance_sensor_s *distance);
@@ -97,4 +97,4 @@ private:
 
 	bool is_distance_valid(float distance);
 
-};
\ No newline at end of file
+};