diff --git a/pages/guide.php b/pages/guide.php
index 08a4a44e..ed60239d 100644
--- a/pages/guide.php
+++ b/pages/guide.php
@@ -147,7 +147,6 @@ class GuidePage extends GenericPage
 
     protected function generateContent() : void
     {
-        /*
         match ($this->show)
         {
             self::SHOW_NEW       => $this->displayNew(),
@@ -156,24 +155,6 @@ class GuidePage extends GenericPage
             self::SHOW_CHANGELOG => $this->displayChangelog(),
             default              => trigger_error('GuidePage::generateContent - what content!?')
         };
-        */
-        switch ($this->show)
-        {
-            case self::SHOW_NEW:
-                $this->displayNew();
-                break;
-            case self::SHOW_EDITOR:
-                $this->displayEditor();
-                break;
-            case self::SHOW_GUIDE:
-                $this->displayGuide();
-                break;
-            case self::SHOW_CHANGELOG:
-                $this->displayChangelog();
-                break;
-            default:
-                trigger_error('GuidePage::generateContent - what content!?');
-        }
     }
 
     private function displayNew() : void
diff --git a/template/pages/guide-edit.tpl.php b/template/pages/guide-edit.tpl.php
index f9ae7c5e..a2db8a9e 100644
--- a/template/pages/guide-edit.tpl.php
+++ b/template/pages/guide-edit.tpl.php
@@ -53,9 +53,10 @@ $this->brick('pageTemplate');
                     <th><label for="locale"><?=Lang::main('language');?></label></th>
                     <td><select name="locale" id="locale" required="required" size="1">
 <?php
-foreach (Lang::locales() as $i => $l):
-    if (Cfg::get('LOCALES') & (1 << $i))
-        echo '                    <option value="'.$i.'"'.($this->editorFields('locale', true) == $i ? ' selected="selected"' : '').'>'.$l."</option>\n";
+foreach (Locale::cases() as $l):
+    if ($l->validate()):
+        echo '                    <option value="'.$l->value.'"'.($this->editorFields('locale', true) == $l->value ? ' selected="selected"' : '').'>'.$l->title()."</option>\n";
+    endif;
 endforeach;
 ?>
                     </select></td>
@@ -68,8 +69,9 @@ endforeach;
                         <select id="category" name="category" required="required"><option></option>
 <?php
 foreach (Lang::guide('category') as $i => $c):
-    if ($c)
+    if ($c):
         echo '                            <option value="'.$i.'"'.($this->editorFields('category', true) == $i ? ' selected="selected"' : '').'>'.$c."</option>\n";
+    endif;
 endforeach;
 ?>
                         </select>
diff --git a/template/pages/text-page-generic.tpl.php b/template/pages/text-page-generic.tpl.php
index f68388d4..a43edcc5 100644
--- a/template/pages/text-page-generic.tpl.php
+++ b/template/pages/text-page-generic.tpl.php
@@ -9,7 +9,7 @@ $this->brick('announcement');
 
 $this->brick('pageTemplate');
 
-if (isset($this->notFound)):
+if ($this->notFound):
 ?>
 <?php
     if (!empty($this->doResync)):