diff --git a/intern/cycles/blender/device.cpp b/intern/cycles/blender/device.cpp
index abcb6de827c..a0ee588ff63 100644
--- a/intern/cycles/blender/device.cpp
+++ b/intern/cycles/blender/device.cpp
@@ -30,7 +30,7 @@ int blender_device_threads(BL::Scene &b_scene)
     return 0;
 }
 
-void adjust_device_info_from_preferences(DeviceInfo &info, PointerRNA cpreferences)
+void static adjust_device_info_from_preferences(DeviceInfo &info, PointerRNA cpreferences)
 {
   if (!get_boolean(cpreferences, "peer_memory")) {
     info.has_peer_memory = false;
diff --git a/source/blender/functions/intern/lazy_function.cc b/source/blender/functions/intern/lazy_function.cc
index a08adf5491f..cfea40b49f7 100644
--- a/source/blender/functions/intern/lazy_function.cc
+++ b/source/blender/functions/intern/lazy_function.cc
@@ -67,11 +67,12 @@ bool LazyFunction::always_used_inputs_available(const Params &params) const
 
 void Params::set_default_remaining_outputs()
 {
-  for (const int i : fn_.outputs().index_range()) {
+  const Span<Output> outputs = fn_.outputs();
+  for (const int i : outputs.index_range()) {
     if (this->output_was_set(i)) {
       continue;
     }
-    const Output &fn_output = fn_.outputs()[i];
+    const Output &fn_output = outputs[i];
     const CPPType &type = *fn_output.type;
     void *data_ptr = this->get_output_data_ptr(i);
     type.value_initialize(data_ptr);