diff --git a/serendipity_event_adminnotes/ChangeLog b/serendipity_event_adminnotes/ChangeLog
index 51d08405..b74a8de2 100644
--- a/serendipity_event_adminnotes/ChangeLog
+++ b/serendipity_event_adminnotes/ChangeLog
@@ -1,2 +1,3 @@
+0.10: Don't emit backend link twice in 1.x (yellowled)
 0.9: Use serendipity 2.0 backend hook
 0.8: Added additional backend markup for 2.0 backend (yellowled)
\ No newline at end of file
diff --git a/serendipity_event_adminnotes/serendipity_event_adminnotes.php b/serendipity_event_adminnotes/serendipity_event_adminnotes.php
index 8764cc26..523111bb 100644
--- a/serendipity_event_adminnotes/serendipity_event_adminnotes.php
+++ b/serendipity_event_adminnotes/serendipity_event_adminnotes.php
@@ -27,7 +27,7 @@ class serendipity_event_adminnotes extends serendipity_event {
             'php'         => '4.1.0'
         ));
 
-        $propbag->add('version',       '0.9');
+        $propbag->add('version',       '0.10');
         $propbag->add('author',        'Garvin Hicking, Matthias Mees');
         $propbag->add('stackable',     false);
         $propbag->add('configuration', array('feedback', 'limit', 'html', 'markup', 'cutoff'));
@@ -434,6 +434,7 @@ class serendipity_event_adminnotes extends serendipity_event {
 ?>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=adminnotes"><?php echo PLUGIN_ADMINNOTES_TITLE; ?></a></li>
 <?php
+                    } else {
                     }
                     // Serendipity 2.0  now uses the new backend_sidebar_admin hook
 
diff --git a/serendipity_event_dbclean/ChangeLog b/serendipity_event_dbclean/ChangeLog
index 74beef58..19698e89 100644
--- a/serendipity_event_dbclean/ChangeLog
+++ b/serendipity_event_dbclean/ChangeLog
@@ -1,3 +1,6 @@
+0.2.6:
+    Proper nav markup for 2.0 backend (yellowled)
+
 0.2.5:
     Added additional backend markup for 2.0 backend (yellowled)
 
diff --git a/serendipity_event_dbclean/serendipity_event_dbclean.php b/serendipity_event_dbclean/serendipity_event_dbclean.php
index c853a29d..6c4e4d02 100644
--- a/serendipity_event_dbclean/serendipity_event_dbclean.php
+++ b/serendipity_event_dbclean/serendipity_event_dbclean.php
@@ -24,7 +24,7 @@ class serendipity_event_dbclean extends serendipity_event {
         $propbag->add('description',   PLUGIN_EVENT_DBCLEAN_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Malte Paskuda, Matthias Mees');
-        $propbag->add('version',       '0.2.5');
+        $propbag->add('version',       '0.2.6');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8'
         ));
@@ -87,11 +87,11 @@ class serendipity_event_dbclean extends serendipity_event {
                         break;
 
                 case 'backend_sidebar_admin':
-                        echo '<li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks">
-                            <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=dbclean">
-                                ' .PLUGIN_EVENT_DBCLEAN_NAME .'
-                            </a>
-                        </li>';
+                    if ($serendipity['version'][0] == '1') {
+                        echo '<li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=dbclean">' .PLUGIN_EVENT_DBCLEAN_NAME .'</a></li>';
+                    } else {
+                        echo '<li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=dbclean">' .PLUGIN_EVENT_DBCLEAN_NAME .'</a></li>';
+                    }
                     return true;
                     break;
 
diff --git a/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php b/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
index afcb9081..aa56363a 100644
--- a/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
+++ b/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
@@ -1268,6 +1268,7 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
                                 </a>
                             </li>';
                         }
+                    } else {
                     }
                     return true;
                     break;
diff --git a/serendipity_plugin_twitter/ChangeLog b/serendipity_plugin_twitter/ChangeLog
index a7bb6504..bb982d11 100644
--- a/serendipity_plugin_twitter/ChangeLog
+++ b/serendipity_plugin_twitter/ChangeLog
@@ -9,6 +9,10 @@ TODO:
 * Twitter announcements/credentials etc. per author instead of
   only per central blog
 
+1.63
+--------------------------
+    * Fix emitting the backend nav link twice (yellowled)
+
 1.62
 --------------------------
     * Emit the twitter timeline header at the proper place in the markup,
diff --git a/serendipity_plugin_twitter/plugin_version.inc.php b/serendipity_plugin_twitter/plugin_version.inc.php
index 73677e17..8aed5d70 100644
--- a/serendipity_plugin_twitter/plugin_version.inc.php
+++ b/serendipity_plugin_twitter/plugin_version.inc.php
@@ -1,4 +1,4 @@
 <?php
 
 // Actual version of both plugins
-@define('PLUGIN_TWITTER_VERSION', '1.62');
+@define('PLUGIN_TWITTER_VERSION', '1.63');
diff --git a/serendipity_plugin_twitter/serendipity_event_twitter.php b/serendipity_plugin_twitter/serendipity_event_twitter.php
index 8e05d055..bdf7f961 100644
--- a/serendipity_plugin_twitter/serendipity_event_twitter.php
+++ b/serendipity_plugin_twitter/serendipity_event_twitter.php
@@ -1010,6 +1010,7 @@ class serendipity_event_twitter extends serendipity_plugin {
 ?>
                             <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=tweeter"><?php echo PLUGIN_EVENT_TWITTER_TWEETER_SIDEBARTITLE; ?></a></li>
 <?php
+                        } else {
                         }
                     }
                     return true;