diff --git a/panels/histogram/module.js b/panels/histogram/module.js
index 750a5bdfad1..78e99d272c3 100644
--- a/panels/histogram/module.js
+++ b/panels/histogram/module.js
@@ -89,7 +89,7 @@ angular.module('kibana.histogram', [])
       _.each(results.facets, function(v, k) {
         // Null values at each end of the time range ensure we see entire range
         if(_.isUndefined($scope.data[k]) || _segment == 0) {
-          var data = [[$scope.time.to.getTime(), null]];
+          var data = [[$scope.time.from.getTime(), null],[$scope.time.to.getTime(), null]];
         } else {
           var data = $scope.data[k].data
         }
@@ -99,11 +99,8 @@ angular.module('kibana.histogram', [])
           segment_data.push([v['time'],v['count']])
         });
 
-        data = segment_data.concat(data)
+        data.splice.apply(data,[1,0].concat(segment_data))
 
-        if(_segment == $scope.panel.index.length-1)
-          data.unshift([$scope.time.from.getTime(), null])
-        
         var series = { 
           data: {
             label: $scope.panel.query[k].label || k, 
diff --git a/panels/timepicker/module.js b/panels/timepicker/module.js
index eb8145e9a3a..7e877976a7a 100644
--- a/panels/timepicker/module.js
+++ b/panels/timepicker/module.js
@@ -136,11 +136,12 @@ angular.module('kibana.timepicker', [])
   }
 
   $scope.time_check = function(){
+
     if(!(_.isUndefined($scope.timepicker))) {
       var from = $scope.panel.mode === 'relative' ? time_ago($scope.panel.timespan) :
-        Date.parse($scope.timepicker.from.date + " " + $scope.timepicker.from.time)
+        new Date(Date.parse($scope.timepicker.from.date + " " + $scope.timepicker.from.time))
       var to = $scope.panel.mode !== 'absolute' ? new Date() :
-        Date.parse($scope.timepicker.to.date + " " + $scope.timepicker.to.time)
+        new Date(Date.parse($scope.timepicker.to.date + " " + $scope.timepicker.to.time))
     } else {
       var from = $scope.panel.mode === 'relative' ? time_ago($scope.panel.timespan) :
         $scope.time.from;