diff --git a/__integration__/RegHubUtil-integration.js b/__integration__/RegHubUtil-integration.js
index ee49ddd9da..ec239f3f2a 100644
--- a/__integration__/RegHubUtil-integration.js
+++ b/__integration__/RegHubUtil-integration.js
@@ -26,7 +26,8 @@ describe('RegHubUtil Integration Tests', () => {
         hubUtil.login(process.env.INTEGRATION_USER, process.env.INTEGRATION_PASSWORD, () => {
           regHubUtil.tags(`${process.env.INTEGRATION_USER}/test_private`, (error, tags) => {
             expect(error).toBeFalsy();
-            expect(tags).toEqual(['latest']);
+            expect(tags.length).toEqual(1);
+            expect(tags[0].name).toEqual('latest');
             resolve();
           });
         });
@@ -50,8 +51,10 @@ describe('RegHubUtil Integration Tests', () => {
       return new Promise((resolve) => {
         hubUtil.login(process.env.INTEGRATION_USER, process.env.INTEGRATION_PASSWORD, () => {
           regHubUtil.tags(`${process.env.INTEGRATION_USER}/test`, (error, tags) => {
+            console.log(tags);
             expect(error).toBeFalsy();
-            expect(tags).toEqual(['latest']);
+            expect(tags.length).toEqual(1);
+            expect(tags[0].name).toEqual('latest');
             resolve();
           });
         });
diff --git a/package.json b/package.json
index 72bd12734f..3040ad9960 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,8 @@
     "classnames": "^1.2.0",
     "coveralls": "^2.11.2",
     "deep-extend": "^0.4.0",
-    "exec": "0.2.0",
     "dockerode": "^2.1.4",
+    "exec": "0.2.0",
     "install": "^0.1.8",
     "jquery": "^2.1.3",
     "mixpanel": "0.2.0",
@@ -50,6 +50,7 @@
     "node-uuid": "^1.4.3",
     "npm": "^2.9.1",
     "object-assign": "^2.0.0",
+    "osx-release": "^1.1.0",
     "parseUri": "^1.2.3-2",
     "react": "^0.13.1",
     "react-bootstrap": "^0.20.3",
diff --git a/src/components/ImageCard.react.js b/src/components/ImageCard.react.js
index 663a703d03..78f77a3f5a 100644
--- a/src/components/ImageCard.react.js
+++ b/src/components/ImageCard.react.js
@@ -122,7 +122,8 @@ var ImageCard = React.createClass({
     } else if (self.state.tags.length === 0) {
       tags = <div className="no-tags">No Tags</div>;
     } else {
-      var tagDisplay = self.state.tags.map(function (t) {
+      var tagDisplay = self.state.tags.map(function (tag) {
+        let t = tag.name;
         if (t === self.state.chosenTag) {
           return <div className="tag active" key={t} onClick={self.handleTagClick.bind(self, t)}>{t}</div>;
         } else {
diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js
index 8b19edfbd0..af75aeff0a 100644
--- a/src/utils/MetricsUtil.js
+++ b/src/utils/MetricsUtil.js
@@ -4,6 +4,8 @@ var uuid = require('node-uuid');
 var fs = require('fs');
 var path = require('path');
 var util = require('./Util');
+var os = require('os');
+var osxRelease = require('osx-release');
 var settings;
 
 try {
@@ -45,19 +47,11 @@ var Metrics = {
       localStorage.setItem('metrics.id', uuid.v4());
     }
 
-    var os;
-
-    if(util.isWindows()) {
-      os = navigator.userAgent;
-    } else {
-      os = navigator.userAgent.match(/Mac OS X (\d+_\d+_\d+)/)[1].replace(/_/g, '.');
-    }
-
     mixpanel.track(name, assign({
       distinct_id: id,
       version: util.packagejson().version,
-      'Operating System Version': os,
-      beta: !!settings.beta
+      'Operating System': os.platform(),
+      'Operating System Version': osxRelease(os.release())
     }, data));
   },
 
diff --git a/src/utils/RegHubUtil.js b/src/utils/RegHubUtil.js
index cf00640249..e831ee945a 100644
--- a/src/utils/RegHubUtil.js
+++ b/src/utils/RegHubUtil.js
@@ -98,8 +98,8 @@ module.exports = {
     }, (error, response, body) => {
       if (response.statusCode === 200) {
         let data = JSON.parse(body);
-        tagServerActions.tagsUpdated({repo, tags: data.tags});
-        if (callback) { callback(null, data.tags); }
+        tagServerActions.tagsUpdated({repo, tags: data});
+        if (callback) { callback(null, data); }
       } else if (error || response.statusCode === 401) {
         repositoryServerActions.error({repo});
         if (callback) { callback(new Error('Failed to fetch repos')); }