diff --git a/mozilla/webtools/partytool/controllers/comments_controller.php b/mozilla/webtools/partytool/controllers/comments_controller.php
index fc306abc4e9..3f2b2bcd902 100644
--- a/mozilla/webtools/partytool/controllers/comments_controller.php
+++ b/mozilla/webtools/partytool/controllers/comments_controller.php
@@ -57,7 +57,7 @@ class CommentsController extends AppController {
       $this->data['Comment']['text'] = nl2br($text);
       $this->data['Comment']['owner'] = $uid;
       $this->data['Comment']['assoc'] = $pid;
-      $this->data['Comment']['time'] = gmmktime();
+      $this->data['Comment']['time'] = mktime();
 
       if ($this->Comment->save($this->data)) {
         $this->redirect('/parties/view/'.$pid.'#c'.$this->Comment->getLastInsertID());
diff --git a/mozilla/webtools/partytool/views/parties/view.thtml b/mozilla/webtools/partytool/views/parties/view.thtml
index 1719be39388..b0311e434a6 100755
--- a/mozilla/webtools/partytool/views/parties/view.thtml
+++ b/mozilla/webtools/partytool/views/parties/view.thtml
@@ -81,7 +81,7 @@
       <div id="c<?php echo $comment['comments']['cid'];?>" class="comment <?php echo $class;?>">
         <span class="comment-content"><?php echo $comment['comments']['text']; ?></span>
         <span class="comment-tag"><br/><br/>Posted by <a href="<?php echo $html->url('/users/view/'.$comment['users']['uid']); ?>">
-        <?php echo $comment['users']['name']; ?></a> on <?php echo date('Y-m-d h:ia', $comment['comments']['time'] - (@$_SESSION['User']['tz'] * 60 * 60)); ?></span>
+        <?php echo $comment['users']['name']; ?></a> on <?php echo gmdate('Y-m-d h:ia', $comment['comments']['time'] + (@$_SESSION['User']['tz'] * 60 * 60)); ?></span>
         </span>
       </div>
     <?php endforeach; 
diff --git a/mozilla/webtools/partytool/webroot/js/maps.js b/mozilla/webtools/partytool/webroot/js/maps.js
index e4975929c36..36f8727f5e3 100755
--- a/mozilla/webtools/partytool/webroot/js/maps.js
+++ b/mozilla/webtools/partytool/webroot/js/maps.js
@@ -30,7 +30,6 @@ function mapInit(aLat, aLng, aZoom, aState) {
 
 function geocode(aLoc) {
     var gcoder = new GClientGeocoder();
-    document.getElementById('geocoded').value = 1;
     gcoder.getLatLng(aLoc, function (point) {
       if (!point) {
         suggest(aLoc);