2 files changed, 5 insertions, 2 deletions
diff --git a/src/containers/sidebars/topology/machine/MachineSidebarContainer.js b/src/containers/sidebars/topology/machine/MachineSidebarContainer.js
index b0d5eed9..f99fc05e 100644
--- a/src/containers/sidebars/topology/machine/MachineSidebarContainer.js
+++ b/src/containers/sidebars/topology/machine/MachineSidebarContainer.js
@@ -3,8 +3,9 @@ import MachineSidebarComponent from "../../../../components/sidebars/topology/ma
 
 const mapStateToProps = state => {
     return {
-        machineId: state.interactionLevel.machineId,
         inSimulation: state.currentExperimentId !== -1,
+        machineId: state.objects.rack[state.objects.tile[state.interactionLevel.tileId].objectId]
+            .machineIds[state.interactionLevel.position - 1],
     };
 };
 
diff --git a/src/containers/timeline/TimelineControlsContainer.js b/src/containers/timeline/TimelineControlsContainer.js
index 1afd336a..16d44052 100644
--- a/src/containers/timeline/TimelineControlsContainer.js
+++ b/src/containers/timeline/TimelineControlsContainer.js
@@ -6,7 +6,9 @@ const mapStateToProps = state => {
     if (state.currentExperimentId !== -1) {
         const sectionIds = state.objects.path[state.objects.experiment[state.currentExperimentId].pathId].sectionIds;
         if (sectionIds) {
-            sectionTicks = sectionIds.map(sectionId => state.objects.section[sectionId].startTick);
+            sectionTicks = sectionIds
+                .filter(sectionId => state.objects.section[sectionId].startTick !== 0)
+                .map(sectionId => state.objects.section[sectionId].startTick);
         }
     }