diff --git a/libpandabase/utils/bit_utils.h b/libpandabase/utils/bit_utils.h
index 1272104d6f42c93598a8a38bd1396a831c9fd69e..86b87f5580b1cb1f912ba80da235d8cc14210f10 100644
--- a/libpandabase/utils/bit_utils.h
+++ b/libpandabase/utils/bit_utils.h
@@ -172,7 +172,7 @@ inline uint8_t GetByteFrom(T value, uint64_t index)
 inline uint16_t ReverseBytes(uint16_t value)
 {
     constexpr uint32_t OFFSET_0 = 8;
-    return (value << OFFSET_0) | (value >> OFFSET_0);  // NOLINT(hicpp-signed-bitwise)
+    return static_cast<uint16_t>(value << OFFSET_0) | static_cast<uint16_t>(value >> OFFSET_0);
 }
 
 inline uint32_t ReverseBytes(uint32_t value)
diff --git a/libpandabase/utils/type_converter.cpp b/libpandabase/utils/type_converter.cpp
index a6208bf13fe23e5015155ce288867f5e3df7253d..addce3f6054d6ad0398bd83acf0c2819563463dc 100644
--- a/libpandabase/utils/type_converter.cpp
+++ b/libpandabase/utils/type_converter.cpp
@@ -84,7 +84,7 @@ bool operator!=(const ValueUnit &lhs, const ValueUnit &rhs)
 std::ostream &operator<<(std::ostream &os, const ValueUnit &element)
 {
     if (element.GetValue().index() == 0U) {
-        os << std::fixed << std::setprecision(element.GetPrecision()) << element.GetDoubleValue()
+        os << std::fixed << std::setprecision(static_cast<int>(element.GetPrecision()))  << element.GetDoubleValue()
            << std::setprecision(-1);
     } else {
         os << element.GetUint64Value();