diff --git a/Packages/lesiontracker/compatibility/nonTargetTool.js b/Packages/lesiontracker/compatibility/nonTargetTool.js
index e08ba25f8..edab09b8a 100644
--- a/Packages/lesiontracker/compatibility/nonTargetTool.js
+++ b/Packages/lesiontracker/compatibility/nonTargetTool.js
@@ -83,10 +83,15 @@
     }
 
     function createNewMeasurement(mouseEventData) {
+        var imageId = mouseEventData.image.imageId;
 
-        // Get seriesInstanceUId & studyInstanceUId
-        var seriesInstanceUid = cornerstoneTools.metaData.get('series', mouseEventData.image.imageId).instanceUid;
-        var studyInstanceUid = cornerstoneTools.metaData.get('study', mouseEventData.image.imageId).instanceUid;
+        // Get studyInstanceUid
+        var study = cornerstoneTools.metaData.get('study', imageId);
+        var studyInstanceUid = study.studyInstanceUid;
+
+        // Get seriesInstanceUid
+        var series = cornerstoneTools.metaData.get('series', imageId);
+        var seriesInstanceUid = series.seriesInstanceUid;
 
         // create the measurement data for this tool with the end handle activated
         var measurementData = {
diff --git a/Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js b/Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js
index 03fcb9fe9..bc4c8f267 100644
--- a/Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js
+++ b/Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js
@@ -12,7 +12,7 @@ function getLesionLocationCallback(measurementData, eventData, doneCallback) {
     var element = eventData.element;
     var enabledElement = cornerstone.getEnabledElement(element);
     var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId);
-    var timepoint = Timepoints.findOne({timepointName: study.date});
+    var timepoint = Timepoints.findOne({timepointName: study.studyDate});
     if (!timepoint) {
         return;
     }
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js
index 1c65ff5b7..e5fb1b636 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js
@@ -28,10 +28,12 @@ function updateLesions(e) {
         if (!enabledElement) {
             return;
         }
-        var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId);
-        var series = cornerstoneTools.metaData.get('series', enabledElement.image.imageId);
 
-        var timepoint = Timepoints.findOne({timepointName: study.date});
+        var imageId = enabledElement.image.imageId;
+        var study = cornerstoneTools.metaData.get('study', imageId);
+        var series = cornerstoneTools.metaData.get('series', imageId);
+
+        var timepoint = Timepoints.findOne({timepointName: study.studyDate});
         if (!timepoint) {
             return;
         }
@@ -41,7 +43,7 @@ function updateLesions(e) {
 
         // TODO: Bring series in correct imageViewport
 
-        if (timepointObject.seriesInstanceUid !== series.instanceUid) {
+        if (timepointObject.seriesInstanceUid !== series.seriesInstanceUid) {
             console.log("not in same series");
             var newSeriesData  = {
                 seriesInstanceUid: timepointObject.seriesInstanceUid,
diff --git a/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js b/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
index bd93618e5..45b1792ec 100644
--- a/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
+++ b/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
@@ -4,8 +4,10 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
     // Get the current element's timepointID from the study date metadata
     var element = eventData.element;
     var enabledElement = cornerstone.getEnabledElement(element);
-    var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId);
-    var timepoint = Timepoints.findOne({timepointName: study.date});
+    var imageId = enabledElement.image.imageId;
+
+    var study = cornerstoneTools.metaData.get('study', imageId);
+    var timepoint = Timepoints.findOne({timepointName: study.studyDate});
     if (!timepoint) {
         return;
     }
diff --git a/Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js
index 36444fd56..763e8aa78 100644
--- a/Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -264,8 +264,6 @@ function loadSeriesIntoViewport(data) {
         // This is used to update the value of the "active viewport", when the user interacts
         // with a new viewport element
         function sendActivationTrigger(e, eventData) {
-            log.info('imageViewerViewport sendActivationTrigger');
-
             // Check if the current active viewport in the Meteor Session
             // Is the same as the viewport in which the activation event was fired.
             // If it was, no changes are necessary, so stop here.
@@ -275,6 +273,8 @@ function loadSeriesIntoViewport(data) {
                 return;
             }
 
+            log.info('imageViewerViewport sendActivationTrigger');
+
             // Otherwise, trigger an 'ActivateViewport' event to be handled by the Template event
             // handler
             eventData.viewportIndex = viewportIndex;
diff --git a/Packages/viewerbase/components/viewer/viewportOverlay/viewportOverlay.js b/Packages/viewerbase/components/viewer/viewportOverlay/viewportOverlay.js
index a2c904e73..54f1ffd4f 100644
--- a/Packages/viewerbase/components/viewer/viewportOverlay/viewportOverlay.js
+++ b/Packages/viewerbase/components/viewer/viewportOverlay/viewportOverlay.js
@@ -172,7 +172,7 @@ Template.viewportOverlay.helpers({
 
         // Get study data
         var study = cornerstoneTools.metaData.get('study', this.imageId);
-        if (study.instanceUid === viewportStudies.fetch()[0].studyInstanceUid) {
+        if (study.studyInstanceUid === viewportStudies.fetch()[0].studyInstanceUid) {
             return 'Prior';
         }
     }
diff --git a/Packages/viewerbase/lib/metaDataProvider.js b/Packages/viewerbase/lib/metaDataProvider.js
index 3a8171c4b..ed792d161 100644
--- a/Packages/viewerbase/lib/metaDataProvider.js
+++ b/Packages/viewerbase/lib/metaDataProvider.js
@@ -22,17 +22,18 @@ addMetaData = function(imageId, data) {
     var metaData = {};
 
     metaData.study = {
-        instanceUid: studyMetaData.studyInstanceUid,
-        date: studyMetaData.studyDate,
-        time: studyMetaData.studyTime,
-        description: studyMetaData.studyDescription
+        patientId: studyMetaData.patientId,
+        studyInstanceUid: studyMetaData.studyInstanceUid,
+        studyDate: studyMetaData.studyDate,
+        studyTime: studyMetaData.studyTime,
+        studyDescription: studyMetaData.studyDescription
     };
 
     metaData.series = {
-        description: seriesMetaData.seriesDescription,
-        number: seriesMetaData.seriesNumber,
+        seriesDescription: seriesMetaData.seriesDescription,
+        seriesNumber: seriesMetaData.seriesNumber,
         modality: seriesMetaData.modality,
-        instanceUid: seriesMetaData.seriesInstanceUid,
+        seriesInstanceUid: seriesMetaData.seriesInstanceUid,
         numImages: numImages
     };
 
@@ -42,7 +43,7 @@ addMetaData = function(imageId, data) {
         photometricInterpretation: instanceMetaData.photometricInterpretation,
         sopInstanceUid: instanceMetaData.sopInstanceUid,
         sopClassUid: instanceMetaData.sopClassUid,
-        number: instanceMetaData.instanceNumber,
+        instanceNumber: instanceMetaData.instanceNumber,
         index: imageIndex
     };
 
diff --git a/Packages/viewerbase/log.js b/Packages/viewerbase/log.js
index bb7ba9220..e188235f2 100644
--- a/Packages/viewerbase/log.js
+++ b/Packages/viewerbase/log.js
@@ -1,3 +1,3 @@
 // Create package logger using loglevel
 // https://atmospherejs.com/spacejamio/loglevel
-log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'info');
\ No newline at end of file
+log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'warn');
\ No newline at end of file