diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp
index 3d4b7afc5a..1f58cbafe9 100644
--- a/src/network/core/address.cpp
+++ b/src/network/core/address.cpp
@@ -172,8 +172,8 @@ bool NetworkAddress::IsInNetmask(const std::string &netmask)
 	uint32_t *mask;
 	switch (this->address.ss_family) {
 		case AF_INET:
-			ip = static_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&this->address))->sin_addr.s_addr);
-			mask = static_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&mask_address.address))->sin_addr.s_addr);
+			ip = reinterpret_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&this->address))->sin_addr.s_addr);
+			mask = reinterpret_cast<uint32_t*>(&(reinterpret_cast<struct sockaddr_in*>(&mask_address.address))->sin_addr.s_addr);
 			break;
 
 		case AF_INET6:
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index f0d5ab901a..47289a4117 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -139,8 +139,8 @@ constexpr UnpackNetworkCommandProc MakeUnpackNetworkCommandCallback() noexcept
 	using Tcallback = std::tuple_element_t<Tcb, decltype(_callback_tuple)>;
 	if constexpr (std::is_same_v<Tcallback, CommandCallback * const> || // Callback type is CommandCallback.
 			std::is_same_v<Tcallback, CommandCallbackData * const> || // Callback type is CommandCallbackData.
-			std::is_same_v<typename CommandTraits<static_cast<>(Tcmd)>::CbArgs, typename CallbackArgsHelper<Tcallback>::Args> || // Callback proc takes all command return values and parameters.
-			(!std::is_void_v<typename CommandTraits<static_cast<>(Tcmd)>::RetTypes> && std::is_same_v<typename CallbackArgsHelper<typename CommandTraits<static_cast<>(Tcmd)>::RetCallbackProc const>::Args, typename CallbackArgsHelper<Tcallback>::Args>)) { // Callback return is more than CommandCost and the proc takes all return values.
+			std::is_same_v<typename CommandTraits<Tcmd>::CbArgs, typename CallbackArgsHelper<Tcallback>::Args> || // Callback proc takes all command return values and parameters.
+			(!std::is_void_v<typename CommandTraits<Tcmd>::RetTypes> && std::is_same_v<typename CallbackArgsHelper<typename CommandTraits<Tcmd>::RetCallbackProc const>::Args, typename CallbackArgsHelper<Tcallback>::Args>)) { // Callback return is more than CommandCost and the proc takes all return values.
 		return &UnpackNetworkCommand<Tcmd, Tcb>;
 	} else {
 		return nullptr;
@@ -462,7 +462,7 @@ template <Commands Tcmd>
 CommandDataBuffer SanitizeCmdStrings(const CommandDataBuffer &data)
 {
 	auto args = EndianBufferReader::ToValue<typename CommandTraits<Tcmd>::Args>(data);
-	SanitizeStringsHelper(CommandTraits<Tcmd>::flags, args, std::make_index_sequence<std::tuple_size_v<typename CommandTraits<static_cast<>(Tcmd)>::Args>>{});
+	SanitizeStringsHelper(CommandTraits<Tcmd>::flags, args, std::make_index_sequence<std::tuple_size_v<typename CommandTraits<Tcmd>::Args>>{});
 	return EndianBufferWriter<CommandDataBuffer>::FromValue(args);
 }
 
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index e0fba7a8e3..b64bbe4f37 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -133,7 +133,7 @@ void FileStringReader::HandlePragma(char *str)
 	} else if (!memcmp(str, "winlangid ", 10)) {
 		const char *buf = str + 10;
 		long langid = std::strtol(buf, nullptr, 16);
-		if (langid > static_cast<long>UINT16_MAX || langid < 0) {
+		if (langid > static_cast<long>(UINT16_MAX) || langid < 0) {
 			FatalError("Invalid winlangid {}", buf);
 		}
 		_lang.winlangid = static_cast<uint16_t>(langid);