diff --git a/LesionTracker/client/components/toolbarSection/toolbarSection.js b/LesionTracker/client/components/toolbarSection/toolbarSection.js
index 09a2a504f..4c8118da7 100644
--- a/LesionTracker/client/components/toolbarSection/toolbarSection.js
+++ b/LesionTracker/client/components/toolbarSection/toolbarSection.js
@@ -9,11 +9,11 @@ Template.toolbarSection.helpers({
         Session.get('LayoutManagerUpdated');
 
         // Stops here if layout manager is not defined yet
-        if (!window.layoutManager) {
+        if (!Viewerbase.layoutManager) {
             return;
         }
 
-        return window.layoutManager.viewportData.length > 1;
+        return Viewerbase.layoutManager.viewportData.length > 1;
     },
 
     leftSidebarToggleButtonData() {
@@ -217,7 +217,7 @@ Template.toolbarSection.events({
     'click #toggleTarget'(event, instance) {
         const $target = $(event.currentTarget);
         if (!$target.hasClass('active') && $target.hasClass('expanded')) {
-            toolManager.setActiveTool('bidirectional');
+            Viewerbase.toolManager.setActiveTool('bidirectional');
         }
     },
 
diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 69d27d989..5b0b0a041 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -1,12 +1,11 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
 import { ReactiveDict } from 'meteor/reactive-dict';
-import { OHIF } from 'meteor/ohif:core';
-import 'meteor/ohif:viewerbase';
 import { _ } from 'meteor/underscore';
 
-// @TODO: Figure out what to change so we don't have this duplicate import (export createStacks?)
-import { Viewerbase } from 'meteor/ohif:viewerbase';
+import { OHIF } from 'meteor/ohif:core';
+import 'meteor/ohif:viewerbase';
+import 'meteor/ohif:metadata';
 
 Session.set('ViewerMainReady', false);
 Session.set('TimepointsReady', false);
@@ -70,7 +69,8 @@ Template.viewer.onCreated(() => {
 
     instance.data.studies.forEach(study => {
         study.selected = true;
-        study.displaySets = OHIF.viewerbase.createStacks(study);
+        const studyMetadata = new OHIF.metadata.StudyMetadata(study);
+        study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
         OHIF.viewer.Studies.insert(study);
     });
 
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 0d906ffd8..b2ecef971 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -55,7 +55,6 @@ Template.viewer.onCreated(() => {
     ViewerData[contentId].studyInstanceUids = [];
     instance.data.studies.forEach(study => {
         study.selected = true;
-        // study.displaySets = OHIF.viewerbase.createStacks(study);
         const studyMetadata = new OHIF.metadata.StudyMetadata(study);
         study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
         OHIF.viewer.Studies.insert(study);
diff --git a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js
index 3c1b90a57..cb2b61604 100644
--- a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js
+++ b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js
@@ -65,7 +65,7 @@ class MeasurementHandlers {
         // Get the update the measurement number after inserting
         Meteor.defer(() => {
             measurementData.measurementNumber = Collection.findOne(measurementData._id).measurementNumber;
-            cornerstone.updateImage(getActiveViewportElement());
+            cornerstone.updateImage(OHIF.viewerbase.viewportUtils.getActiveViewportElement());
         });
 
         // Signal unsaved changes
diff --git a/Packages/ohif-viewerbase/client/lib/stackImagePositionOffsetSynchronizer.js b/Packages/ohif-viewerbase/client/lib/stackImagePositionOffsetSynchronizer.js
index 9654db16c..7885d70cb 100644
--- a/Packages/ohif-viewerbase/client/lib/stackImagePositionOffsetSynchronizer.js
+++ b/Packages/ohif-viewerbase/client/lib/stackImagePositionOffsetSynchronizer.js
@@ -181,14 +181,23 @@ class StackImagePositionOffsetSynchronizer {
   }
 
   getViewportImageNormal(element) {
+      if(!element) {
+        return;
+      }
+
       element = $(element).get(0);
 
       try {
         const enabledElement = cornerstone.getEnabledElement(element);
+
+        if(!enabledElement || !enabledElement.image) {
+          return;
+        }
+
         const imageId = enabledElement.image.imageId;
         const imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId);
 
-        return imagePlane.rowCosines.clone().cross(imagePlane.columnCosines);;
+        return imagePlane.rowCosines.clone().cross(imagePlane.columnCosines);
       } catch(error) {
         console.log(error.message);
       }