diff --git a/src/AggregateFunctions/AggregateFunctionAny.cpp b/src/AggregateFunctions/AggregateFunctionAny.cpp
index b03825773fd..da28602972c 100644
--- a/src/AggregateFunctions/AggregateFunctionAny.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAny.cpp
@@ -9,7 +9,7 @@ struct Settings;
 namespace
 {
 template <template <typename> class AggregateFunctionTemplate, template <typename, bool> class Data>
-static IAggregateFunction * createAggregateFunctionSingleValueRespectNulls(
+IAggregateFunction * createAggregateFunctionSingleValueRespectNulls(
     const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index a3e9aa340ef..5c101888140 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -195,7 +195,7 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
     {
         auto opt = getAssociatedFunctionByNullsAction(is_case_insensitive ? case_insensitive_name : name, action);
         if (opt)
-            found = std::move(*opt);
+            found = *opt;
 
         out_properties = found.properties;
         if (query_context && query_context->getSettingsRef().log_queries)
diff --git a/src/Interpreters/examples/hash_map.cpp b/src/Interpreters/examples/hash_map.cpp
index f9fc36454f6..b55f174678e 100644
--- a/src/Interpreters/examples/hash_map.cpp
+++ b/src/Interpreters/examples/hash_map.cpp
@@ -82,10 +82,11 @@ int main(int argc, char ** argv)
     std::vector<Key> data(n);
     Value value;
 
+    NullsAction action = NullsAction::EMPTY;
     AggregateFunctionProperties properties;
-    AggregateFunctionPtr func_count = factory.get("count", data_types_empty, {}, properties);
-    AggregateFunctionPtr func_avg = factory.get("avg", data_types_uint64, {}, properties);
-    AggregateFunctionPtr func_uniq = factory.get("uniq", data_types_uint64, {}, properties);
+    AggregateFunctionPtr func_count = factory.get("count", action, data_types_empty, {}, properties);
+    AggregateFunctionPtr func_avg = factory.get("avg", action, data_types_uint64, {}, properties);
+    AggregateFunctionPtr func_uniq = factory.get("uniq", action, data_types_uint64, {}, properties);
 
     #define INIT \
     { \