diff --git a/userspace/engine/falco_source.h b/userspace/engine/falco_source.h
index 469f9aec..d443b2ba 100644
--- a/userspace/engine/falco_source.h
+++ b/userspace/engine/falco_source.h
@@ -58,10 +58,8 @@ struct falco_source
 
 	inline bool is_field_defined(const std::string& field) const
 	{
-		auto *chk = filter_factory->new_filtercheck(field.c_str());
-		if (chk)
+		if (filter_factory->new_filtercheck(field.c_str()) != nullptr)
 		{
-			delete(chk);
 			return true;
 		}
 		return false;
diff --git a/userspace/engine/rule_loader_compiler.cpp b/userspace/engine/rule_loader_compiler.cpp
index a793c8b0..16c36738 100644
--- a/userspace/engine/rule_loader_compiler.cpp
+++ b/userspace/engine/rule_loader_compiler.cpp
@@ -439,7 +439,7 @@ bool rule_loader::compiler::compile_condition(
 	sinsp_filter_compiler compiler(filter_factory, ast_out.get());
 	try
 	{
-		filter_out.reset(compiler.compile());
+		filter_out = std::move(compiler.compile());
 	}
 	catch(const sinsp_exception& e)
 	{
diff --git a/userspace/falco/app/actions/init_inspectors.cpp b/userspace/falco/app/actions/init_inspectors.cpp
index 503af19a..9bf49cd0 100644
--- a/userspace/falco/app/actions/init_inspectors.cpp
+++ b/userspace/falco/app/actions/init_inspectors.cpp
@@ -172,7 +172,7 @@ falco::app::run_result falco::app::actions::init_inspectors(falco::app::state& s
 				if (is_input)
 				{
 					auto gen_check = src_info->inspector->new_generic_filtercheck();
-					src_info->filterchecks->add_filter_check(gen_check);
+					src_info->filterchecks->add_filter_check(std::move(gen_check));
 				}
 				used_plugins.insert(plugin->name());
 			}
diff --git a/userspace/falco/stats_writer.cpp b/userspace/falco/stats_writer.cpp
index 130d68af..d2f0ac25 100644
--- a/userspace/falco/stats_writer.cpp
+++ b/userspace/falco/stats_writer.cpp
@@ -362,7 +362,7 @@ void stats_writer::collector::get_metrics_output_fields_additional(
 
 	auto buffer = inspector->get_sinsp_stats_v2_buffer();
 	auto sinsp_stats_v2 = inspector->get_sinsp_stats_v2();
-	sinsp_thread_manager* thread_manager = inspector->m_thread_manager;
+	sinsp_thread_manager* thread_manager = inspector->m_thread_manager.get();
 	const scap_stats_v2* sinsp_stats_v2_snapshot = libsinsp::stats::get_sinsp_stats_v2(flags, agent_info, thread_manager, sinsp_stats_v2, buffer, &nstats, &rc);
 
 	uint32_t base_stat = 0;