diff --git a/src/database/Database.cpp b/src/database/Database.cpp
index 5c0e4215fab..6fc1b53474e 100644
--- a/src/database/Database.cpp
+++ b/src/database/Database.cpp
@@ -45,7 +45,7 @@ namespace db {
 		bool operator()(const std::unique_ptr< Table > &ptr) { return ptr && ptr->getName() == name; }
 	};
 
-	Database::Database(Backend backend) : m_backend(backend){};
+	Database::Database(Backend backend) : m_backend(backend){}
 
 	void Database::init(const ConnectionParameter &parameter) {
 		assert(parameter.applicability() == m_backend);
diff --git a/src/database/Table.h b/src/database/Table.h
index 72f37ff17bf..2c2ca2999d9 100644
--- a/src/database/Table.h
+++ b/src/database/Table.h
@@ -22,7 +22,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace db {
diff --git a/src/murmur/database/ACLTable.h b/src/murmur/database/ACLTable.h
index c5ee6263c2f..b5d1b292d4f 100644
--- a/src/murmur/database/ACLTable.h
+++ b/src/murmur/database/ACLTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/BanTable.h b/src/murmur/database/BanTable.h
index 24aecb0a51e..f3ba312c621 100644
--- a/src/murmur/database/BanTable.h
+++ b/src/murmur/database/BanTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/ChannelLinkTable.h b/src/murmur/database/ChannelLinkTable.h
index 367ae268594..27bd9f4a05b 100644
--- a/src/murmur/database/ChannelLinkTable.h
+++ b/src/murmur/database/ChannelLinkTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/ChannelListenerTable.h b/src/murmur/database/ChannelListenerTable.h
index 815d2f606b8..5933f73bbcc 100644
--- a/src/murmur/database/ChannelListenerTable.h
+++ b/src/murmur/database/ChannelListenerTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/ChannelPropertyTable.h b/src/murmur/database/ChannelPropertyTable.h
index 4f2ba505957..71bc14847ed 100644
--- a/src/murmur/database/ChannelPropertyTable.h
+++ b/src/murmur/database/ChannelPropertyTable.h
@@ -19,7 +19,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/ChannelTable.h b/src/murmur/database/ChannelTable.h
index 547e2567d4b..1904212376e 100644
--- a/src/murmur/database/ChannelTable.h
+++ b/src/murmur/database/ChannelTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/ConfigTable.h b/src/murmur/database/ConfigTable.h
index 35f43eae08e..1b79b3ed492 100644
--- a/src/murmur/database/ConfigTable.h
+++ b/src/murmur/database/ConfigTable.h
@@ -14,7 +14,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/DBBan.cpp b/src/murmur/database/DBBan.cpp
index 3720a9aac03..9a80efff100 100644
--- a/src/murmur/database/DBBan.cpp
+++ b/src/murmur/database/DBBan.cpp
@@ -100,7 +100,7 @@ namespace server {
 			// byte address. Thus, the subnet mask that has to be applied to these last 4 bytes also needs to ignore the
 			// leading 12 bytes = 96 bits.
 			assert(mask <= 32);
-			return mask + 96;
+			return static_cast< std::uint8_t >(mask + 96);
 		}
 
 		bool operator==(const DBBan &lhs, const DBBan &rhs) {
diff --git a/src/murmur/database/GroupMemberTable.h b/src/murmur/database/GroupMemberTable.h
index dc959af3fc6..064b3a884f5 100644
--- a/src/murmur/database/GroupMemberTable.h
+++ b/src/murmur/database/GroupMemberTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/GroupTable.h b/src/murmur/database/GroupTable.h
index e5daa0a0fd7..ebcc76d4d83 100644
--- a/src/murmur/database/GroupTable.h
+++ b/src/murmur/database/GroupTable.h
@@ -18,7 +18,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/LogTable.h b/src/murmur/database/LogTable.h
index 631866432fc..dc53fb24d56 100644
--- a/src/murmur/database/LogTable.h
+++ b/src/murmur/database/LogTable.h
@@ -15,7 +15,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/ServerTable.h b/src/murmur/database/ServerTable.h
index 8383953d120..63a425c0e1e 100644
--- a/src/murmur/database/ServerTable.h
+++ b/src/murmur/database/ServerTable.h
@@ -13,7 +13,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/UserPropertyTable.h b/src/murmur/database/UserPropertyTable.h
index 0c169275df0..6d667198eb9 100644
--- a/src/murmur/database/UserPropertyTable.h
+++ b/src/murmur/database/UserPropertyTable.h
@@ -20,7 +20,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 namespace mumble {
 namespace server {
diff --git a/src/murmur/database/UserTable.h b/src/murmur/database/UserTable.h
index f82329aa100..484b30fc002 100644
--- a/src/murmur/database/UserTable.h
+++ b/src/murmur/database/UserTable.h
@@ -23,7 +23,7 @@
 
 namespace soci {
 class session;
-};
+}
 
 class QByteArray;
 
diff --git a/src/tests/TestDatabase/DatabaseTest.cpp b/src/tests/TestDatabase/DatabaseTest.cpp
index c698a06e82b..3964dfb20d1 100644
--- a/src/tests/TestDatabase/DatabaseTest.cpp
+++ b/src/tests/TestDatabase/DatabaseTest.cpp
@@ -117,7 +117,7 @@ template<> char *toString(const std::unordered_set< std::string > &set) {
 	return buffer;
 }
 
-}; // namespace QTest
+} // namespace QTest
 
 
 class TestDatabase : public Database {
diff --git a/src/tests/TestDatabase/server/ServerDatabaseTest.cpp b/src/tests/TestDatabase/server/ServerDatabaseTest.cpp
index ed74b3acad6..96fe52231f3 100644
--- a/src/tests/TestDatabase/server/ServerDatabaseTest.cpp
+++ b/src/tests/TestDatabase/server/ServerDatabaseTest.cpp
@@ -108,7 +108,7 @@ template<> char *toString(const ::msdb::DBUserData &data) {
 	return buffer;
 }
 
-}; // namespace QTest
+} // namespace QTest
 
 namespace std {
 template< std::size_t size > char *toString(const std::array< std::uint8_t, size > array) {
@@ -1481,7 +1481,7 @@ void ServerDatabaseTest::banTable_general() {
 	// Since we re-used the server ID, base address and prefix length, adding this should error
 	QVERIFY_EXCEPTION_THROWN(table.addBan(ban2), ::mdb::AccessException);
 
-	ban2.prefixLength += 1;
+	ban2.prefixLength++;
 	QVERIFY(!table.banExists(ban2));
 	table.addBan(ban2);
 	QVERIFY(table.banExists(ban2));