diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index 79f46e79992..d16824b71dc 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -326,7 +326,8 @@ public:
 
 #if USE_EMBEDDED_COMPILER
 
-    void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
+    void compileAddImpl(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const
+    requires(canBeNativeType<Numerator>() && canBeNativeType<Denominator>())
     {
         llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
 
@@ -345,6 +346,12 @@ public:
         b.CreateStore(denominator_value_updated, denominator_ptr);
     }
 
+    void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
+    {
+        if constexpr(canBeNativeType<Numerator>() && canBeNativeType<Denominator>())
+            compileAddImpl(builder, aggregate_data_ptr, arguments);
+    }
+
 #endif
 
 private:
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp b/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp
index bcd295d72d8..7a01e34c919 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp
@@ -94,6 +94,20 @@ public:
         b.CreateStore(denominator_value_updated, denominator_ptr);
     }
 
+    void
+    compileMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr) const override
+    {
+        if constexpr (canBeNativeType<Weight>() && canBeNativeType<Numerator>() && canBeNativeType<Denominator>())
+            Base::compileMergeImpl(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+    }
+
+    llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (canBeNativeType<Weight>() && canBeNativeType<Numerator>() && canBeNativeType<Denominator>())
+            return Base::compileGetResultImpl(builder, aggregate_data_ptr);
+        return nullptr;
+    }
+
     void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
     {
         if constexpr (canBeNativeType<Weight>() && canBeNativeType<Numerator>() && canBeNativeType<Denominator>())
@@ -110,7 +124,7 @@ bool allowTypes(const DataTypePtr& left, const DataTypePtr& right) noexcept
 
     constexpr auto allow = [](WhichDataType t)
     {
-        return t.isInt() || t.isUInt() || t.isFloat();
+        return t.isInt() || t.isUInt() || t.isNativeFloat();
     };
 
     return allow(l_dt) && allow(r_dt);
diff --git a/src/DataTypes/Native.h b/src/DataTypes/Native.h
index 3edce1bb9cf..1900906204f 100644
--- a/src/DataTypes/Native.h
+++ b/src/DataTypes/Native.h
@@ -74,14 +74,12 @@ static inline llvm::Type * toNativeType(llvm::IRBuilderBase & builder)
 template <typename ToType>
 static inline DataTypePtr toNativeDataType()
 {
-    if constexpr (std::is_same_v<ToType, Int8> || std::is_same_v<ToType, UInt8> ||
+    static_assert(std::is_same_v<ToType, Int8> || std::is_same_v<ToType, UInt8> ||
         std::is_same_v<ToType, Int16> || std::is_same_v<ToType, UInt16> ||
         std::is_same_v<ToType, Int32> || std::is_same_v<ToType, UInt32> ||
         std::is_same_v<ToType, Int64> || std::is_same_v<ToType, UInt64> ||
-        std::is_same_v<ToType, Float32> || std::is_same_v<ToType, Float64>)
-        return std::make_shared<DataTypeNumber<ToType>>();
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid cast to native data type");
+        std::is_same_v<ToType, Float32> || std::is_same_v<ToType, Float64>);
+    return std::make_shared<DataTypeNumber<ToType>>();
 }
 
 /// Cast LLVM value with type to bool