diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index fde84fd51aa..f5adaecd401 100644
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -6,8 +6,6 @@
     require_once("../../config.php");
     require_once("lib.php");
     
-    include_once($CFG->dirroot."/mod/wiki/ewikimoodlelib.php");
-    include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php");
 
     require_login($course->id);
     
@@ -83,6 +81,10 @@
       }          
     }
             
+    # Database and Binary Handler
+    include_once($CFG->dirroot."/mod/wiki/ewikimoodlelib.php");
+    include_once($CFG->dirroot."/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php");
+    
     /// The wiki_entry->pagename is set to the specified value of the wiki,
     /// or the default value in the 'lang' file if the specified value was empty.
     define("EWIKI_PAGE_INDEX",$wiki_entry->pagename);
diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index 79f8d1e0a03..fb13f187b46 100644
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -279,8 +279,10 @@
 	if ($pf_a = $ewiki_plugins["init"]) foreach ($pf_a as $pf) {
            // Binary Handling starts here
            #### MOODLE CHANGE TO BE COMPATIBLE WITH PHP 4.1
+           #if(headers_sent($file,$line)) {
+           #  error("Headers already sent: $file:$line");
            if(headers_sent()) {
-             error("Headers already sent");
+             error("Headers already sent.");
            }
            $pf($GLOBALS);
         }
diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 4e0a33d1f71..e22ed6f9eee 100644
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -8,7 +8,9 @@
 
 
 #-- settings
-define("EWIKI_UPLOAD_MAXSIZE", 2*1024*1024);
+
+# Defined in view.php
+#define("EWIKI_UPLOAD_MAXSIZE", 2*1024*1024);
 define("EWIKI_PAGE_UPLOAD", "FileUpload");
 define("EWIKI_PAGE_DOWNLOAD", "FileDownload");
 define("EWIKI_ACTION_ATTACHMENTS", "attachments");  #-- define to 0 to disable
diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 87b921e7db2..c18a2195298 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -1357,4 +1357,4 @@ function wiki_admin_revert($proceed, $authorfieldpattern, $changesfield, $howtoo
   } #-- while($row)
   return $ret;
 }
-?> 
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 3e28baec5d6..dc61808eabb 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -95,7 +95,10 @@
         global $ewiki_title;
 
 ///     #-- predefine some of the configuration constants
-        define("EWIKI_NAME", $wiki_entry->pagename);
+        
+        
+        /// EWIKI_NAME is defined in ewikimoodlelibs, so that also admin.php can use this
+        #define("EWIKI_NAME", $wiki_entry->pagename);
 
         /// Search Hilighting
         if($ewiki_title=="SearchPages") {
@@ -212,6 +215,11 @@
     }
 
 
+    # Group wiki, ...: No wikipage and no ewiki_title
+    if(!isset($ewiki_title)) {
+          $ewiki_title="";
+    }
+        
 /// Moodle Log
     add_to_log($course->id, "wiki", $ewiki_action, "view.php?id=$cm->id&groupid=$groupid&userid=$userid&wikipage=$wikipage", $wiki->name." ".$ewiki_title);
 
@@ -225,7 +233,7 @@
     $strwiki  = get_string("modulename", "wiki");
 
     print_header("$course->shortname: ".($ewiki_title?$ewiki_title:$wiki->name), "$course->fullname",
-                "$navigation <A HREF=\"index.php?id=$course->id\">$strwikis</A> -> <A HREF=\"view.php?id=$moodleID\">$wiki->name</a> -> $ewiki_title",
+                "$navigation <A HREF=\"index.php?id=$course->id\">$strwikis</A> -> <A HREF=\"view.php?id=$moodleID\">$wiki->name</a>".($ewiki_title?" -> $ewiki_title":""),
                 "", "", true, update_module_button($cm->id, $course->id, $strwiki),
                 navmenu($course, $cm));