diff --git a/source/RobotAPI/components/ArViz/ArVizStorage.cpp b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
index 5430091b2b917f819e2acb0e8717e904e8d4e45f..8630c8a9f76cce5bb9b6d61005bed907786e8b3c 100644
--- a/source/RobotAPI/components/ArViz/ArVizStorage.cpp
+++ b/source/RobotAPI/components/ArViz/ArVizStorage.cpp
@@ -203,7 +203,7 @@ namespace armarx
 
                 // Insert or create the layer
                 bool found = false;
-                for (auto& layer : currentState)
+                for (viz::data::TimestampedLayerUpdate& layer : currentState)
                 {
                     if (layer.update.component == update.component
                         && layer.update.name == update.name)
@@ -298,9 +298,9 @@ namespace armarx
 
         std::unique_lock<std::mutex> lock(historyMutex);
 
-        for (auto& interaction : interactions)
+        for (viz::data::InteractionFeedback const& interaction : interactions)
         {
-            for (auto& entry : interactionBuffer)
+            for (viz::data::InteractionFeedback& entry : interactionBuffer)
             {
                 if (entry.component == interaction.component
                         && entry.layer == interaction.layer
@@ -327,7 +327,7 @@ namespace armarx
         }
 
         result.updates.reserve(currentState.size());
-        for (auto& layer : currentState)
+        for (viz::data::TimestampedLayerUpdate& layer : currentState)
         {
             if (layer.revision > revision)
             {
diff --git a/source/RobotAPI/components/ArViz/ArVizStorage.h b/source/RobotAPI/components/ArViz/ArVizStorage.h
index f01a68fba62bd7f9fb961dcb182480774ec848de..c484b6d21c28f8ba25ebf7c8f1ff1e40f816c8d7 100644
--- a/source/RobotAPI/components/ArViz/ArVizStorage.h
+++ b/source/RobotAPI/components/ArViz/ArVizStorage.h
@@ -43,8 +43,8 @@ namespace armarx
      * clients and provides them for visualizing components such as the
      * ArViz gui plugin.
      *
-     * In addition, the ArViz storage can be used to record and restore
-     * visualization episodes and restore.
+     * In addition, the ArViz storage can be used to record and replay
+     * visualization episodes.
      *
      *
      * @class ArVizStorage
diff --git a/source/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp b/source/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp
index 0daa2db1c31eeef0ef6dcc1254693a93d82b8e21..5f6b068fccb635c596f2534068e4516fec63693d 100644
--- a/source/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp
+++ b/source/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp
@@ -218,7 +218,7 @@ namespace armarx::viz::coin
 
         node->removeAllChildren();
 
-        auto& object = *loaded.object;
+        VirtualRobot::ManipulationObject& object = *loaded.object;
 
         SoSeparator* nodeSep = new SoSeparator;
 
@@ -228,7 +228,7 @@ namespace armarx::viz::coin
         nodeMat->setOverride(false);
         nodeSep->addChild(nodeMat);
 
-        auto nodeVisu = object.getVisualization<VirtualRobot::CoinVisualization>(visuType);
+        VirtualRobot::CoinVisualizationPtr nodeVisu = object.getVisualization<VirtualRobot::CoinVisualization>(visuType);
         if (nodeVisu)
         {
             SoNode* sepRobNode = nodeVisu->getCoinVisualization();