diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index c9f21f8..84c7918 100644
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -93,7 +93,7 @@ function ajax_check_captured_output() {
     global $CFG;
 
     // Retrieve the output - there should be none.
-    $output = ob_get_contents();
+    $output = trim(ob_get_contents());
     ob_end_clean();
 
     if ($CFG->debugdeveloper && !empty($output)) {
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index c996c60..e89ca03 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -4505,6 +4505,7 @@ class settings_navigation_ajax extends settings_navigation {
         if ($this->initialised || during_initial_install()) {
             return false;
         }
+        $this->context = $this->page->context;
         $this->load_administration_settings();
 
         // Check if local plugins is adding node to site admin.