diff --git a/lib/action.php b/lib/action.php
index 4a164d8b01..a8b5e70b13 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -194,11 +194,11 @@ class Action extends HTMLOutputter // lawsuit
     function showBody()
     {
         $this->elementStart('body');
-        $this->elementStart('wrap');
+        $this->elementStart('div', 'wrap');
         $this->showHeader();
         $this->showCore();
         $this->showFooter();
-        $this->elementEnd('wrap');
+        $this->elementEnd('div', 'wrap');
         $this->elementEnd('body');
     }
 
@@ -576,7 +576,7 @@ class Action extends HTMLOutputter // lawsuit
     // Added @id to li for some control.
     // XXX: We might want to move this to htmloutputter.php
 
-    function menuItem($url, $text, $id=null, $title=null, $is_selected=false)
+    function menuItem($url, $text, $title=null, $is_selected=false, $id=null)
     {
         $lattrs = array();
         if ($is_selected) {
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 0fc6d513f4..ad3af43914 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -342,7 +342,7 @@ class NoticeListItem extends Widget
         $this->out->elementStart('dl', 'timestamp');
         $this->out->element('dt', _('Published')); 
         $this->out->elementStart('dd', null);
-        $this->out->element('a', array('rel' => 'bookmark',
+        $this->out->elementStart('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));
         $dt = common_date_iso8601($this->notice->created);
         $this->out->element('abbr', array('class' => 'published',