diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp
index 868e5122..b8d041a9 100644
--- a/rendering/openglrenderer.cpp
+++ b/rendering/openglrenderer.cpp
@@ -4313,7 +4313,7 @@ void opengl_renderer::MakeScreenshot()
 void
 opengl_renderer::Update_Lights( light_array &Lights ) {
     // arrange the light array from closest to farthest from current position of the camera
-    auto const camera = m_renderpass.camera.position();
+    auto const &camera = m_renderpass.camera.position();
     std::sort(
         std::begin( Lights.data ),
         std::end( Lights.data ),
diff --git a/scene/sceneeditor.cpp b/scene/sceneeditor.cpp
index 792de5a1..be8755a2 100644
--- a/scene/sceneeditor.cpp
+++ b/scene/sceneeditor.cpp
@@ -61,8 +61,7 @@ void
 basic_editor::translate( scene::basic_node *Node, float const Offset ) {
 
     // NOTE: offset scaling is calculated early so the same multiplier can be applied to potential whole group
-    auto location { Node->location() };
-    auto const distance { glm::length( location - glm::dvec3{ Global.pCamera.Pos } ) };
+    auto const distance { glm::length( Node->location() - Global.pCamera.Pos ) };
     auto const offset { static_cast<float>( Offset * std::max( 1.0, distance * 0.01 ) ) };
 
     if( Node->group() <= 1 ) {
diff --git a/world/Event.cpp b/world/Event.cpp
index fad60bc4..3cbb53ab 100644
--- a/world/Event.cpp
+++ b/world/Event.cpp
@@ -537,13 +537,12 @@ updatevalues_event::run_() {
 //        targetcell->LogValues();
         if( targetcell->Track == nullptr ) { continue; }
         // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze
-        auto const location { targetcell->location() };
         for( auto vehicle : targetcell->Track->Dynamics ) {
             if( vehicle->Mechanik ) {
                 WriteLog( " Vehicle: [" + vehicle->name() + "]" );
                 targetcell->PutCommand(
                     vehicle->Mechanik,
-                    &location );
+                    &targetcell->location() );
             }
         }
     }