diff --git a/html/inc/forum_db.inc b/html/inc/forum_db.inc
index 3cf5fd53ce..582179528b 100644
--- a/html/inc/forum_db.inc
+++ b/html/inc/forum_db.inc
@@ -296,7 +296,7 @@ class BoincNotify {
         $db = BoincDb::get();
         return $db->delete($this, 'notify');
     }
-    function delete_aux($clause) {
+    static function delete_aux($clause) {
         $db = BoincDb::get();
         $db->delete_aux('notify', $clause);
     }
diff --git a/html/inc/team.inc b/html/inc/team.inc
index 48de281bdd..60f1507a86 100644
--- a/html/inc/team.inc
+++ b/html/inc/team.inc
@@ -418,12 +418,10 @@ function team_edit_form($team, $label, $url) {
     echo "<form method=post action=$url>\n";
     if ($team) {
         echo "<input type=hidden name=teamid value=$team->id>\n";
-    }
-    if ($team->seti_id) {
-        echo "<p><span class=error>".tra("WARNING: this is a BOINC-wide team. If you make changes here, they will soon be overwritten. Edit the %1BOINC-wide team%2 instead.", "<a href=http://boinc.berkeley.edu/teams/>", "</a>")
-        ."</span>
-            <p>
-        ";
+        if ($team->seti_id) {
+            echo "<p><span class=error>".tra("WARNING: this is a BOINC-wide team. If you make changes here, they will soon be overwritten. Edit the %1BOINC-wide team%2 instead.", "<a href=http://boinc.berkeley.edu/teams/>", "</a>")
+            ."</span><p>";
+        }
     }
     echo '
         <p>
@@ -433,34 +431,34 @@ function team_edit_form($team, $label, $url) {
     start_table();
     row2(tra('Team name, text version').'
         <br><span class="note">'.tra('Don\'t use HTML tags.').'</span>',
-        "<input name=name type=text size=50 value='$team->name'>"
+        "<input name=name type=text size=50 value='".($team?$team->name:"")."'>"
     );
     row2(tra('Team name, HTML version').'
         <br><span class="note">
         '.tra('You may use %1limited HTML tags%2.', '<a href="html.php" target="_new">', '</a>').'
         '.tra('If you don\'t know HTML, leave this box blank.').'</span>',
-        "<input name=name_html type=text size=50 value=\"".str_replace('"',"'",$team->name_html)."\">"
+        "<input name=name_html type=text size=50 value=\"".str_replace('"',"'",($team?$team->name_html:""))."\">"
     );
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
         '.tra('This URL will be linked to from the team\'s page on this site.'),
-        "<input type=text name=url size=60 value='$team->url'>"
+        "<input type=text name=url size=60 value='".($team?$team->url:"")."'>"
     );
     row2(tra('Description of team').':
         <br><span class="note">
         '.tra('You may use %1limited HTML tags%2.', '<a href="html.php" target="_new">', '</a>').'
         </span>',
-        "<textarea name=description cols=60 rows=10>$team->description</textarea>"
+        "<textarea name=description cols=60 rows=10>".($team?$team->description:"")."</textarea>"
     );
 
-    row2(tra('Type of team').':', team_type_select($team->type));
+    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
 
     row2_init(tra('Country'),
         "<select name=country>"
     );
-    print_country_select($team->country);
+    print_country_select($team?$team->country:null);
 
     echo "</select></td></tr>\n";
-    $x = $team->joinable?"checked":"";
+    $x = ($team && $team->joinable)?"checked":"";
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
     row2("",
         "<input type=submit name=new value='$label'>"
diff --git a/html/user/team_change_founder_form.php b/html/user/team_change_founder_form.php
index 3a0c64d27e..2a2583f73a 100644
--- a/html/user/team_change_founder_form.php
+++ b/html/user/team_change_founder_form.php
@@ -104,10 +104,10 @@ if ($navailable_users > 0) {
     end_table();
     echo "<input type=submit value=\"".tra("Change founder")."\">";
 } else {
-    echo '<tr>
-        <td colspan="4">".tra("There are no users to transfer team to.")."</td>
+    echo "<tr>
+        <td colspan='4'>".tra("There are no users to transfer team to.")."</td>
         </tr>
-    ';
+    ";
     end_table();
 }
 echo "</form>";