diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 17276d00744..b6cd24cd6f9 100644
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -22,7 +22,7 @@ class block_rss_client extends block_base {
     function get_content() {
         global $CFG, $editing;
 
-        require_once($CFG->dirroot .'/rss/rsslib.php');
+        require_once($CFG->libdir .'/rsslib.php');
 
         if($this->content !== NULL) {
             return $this->content;
@@ -191,4 +191,4 @@ class block_rss_client extends block_base {
         return $returnstring;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/blocks/rss_client/block_rss_client_action.php b/blocks/rss_client/block_rss_client_action.php
index 8e856fb7abf..16f08f38cba 100644
--- a/blocks/rss_client/block_rss_client_action.php
+++ b/blocks/rss_client/block_rss_client_action.php
@@ -1,10 +1,9 @@
 <?php //$Id$
 
     require_once('../../config.php');
-    require_once($CFG->dirroot .'/rss/rsslib.php');
+    require_once($CFG->libdir .'/rsslib.php');
     require_once(MAGPIE_DIR .'rss_fetch.inc');
-    global $USER, $CFG;
-    
+
     require_login();
     
     //ensure that the logged in user is not using the guest account
diff --git a/blocks/rss_client/block_rss_client_error.php b/blocks/rss_client/block_rss_client_error.php
index 8d2ef39e245..a97d93046cb 100644
--- a/blocks/rss_client/block_rss_client_error.php
+++ b/blocks/rss_client/block_rss_client_error.php
@@ -1,7 +1,6 @@
 <?php //$Id$
 
     require_once('../../config.php');
-    global $USER, $CFG;
 
     require_variable($error);
 
@@ -9,7 +8,7 @@
                  get_string('error'), 
                  get_string('error') );
 
-    print urldecode($error);
+    echo clean_text(urldecode($error));
 
     print_footer();
-?>
\ No newline at end of file
+?>
diff --git a/blocks/rss_client/config_global.html b/blocks/rss_client/config_global.html
index d107df68131..90c9f45daa1 100644
--- a/blocks/rss_client/config_global.html
+++ b/blocks/rss_client/config_global.html
@@ -1,5 +1,5 @@
 <?php
-    require_once($CFG->dirroot .'/rss/rsslib.php');
+    require_once($CFG->libdir .'/rsslib.php');
 ?>
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
@@ -45,4 +45,4 @@
     
     <td colspan="3" align="center"><a href=" <?php echo $CFG->wwwroot; ?>/blocks/rss_client/block_rss_client_action.php?courseid=<?php echo $courseid; ?>"><?php print_string('block_rss_feeds_add_edit', 'block_rss_client')?></a></center><br /><br />
     </td>
-</table>
\ No newline at end of file
+</table>
diff --git a/rss/rsslib.php b/lib/rsslib.php
similarity index 100%
rename from rss/rsslib.php
rename to lib/rsslib.php
diff --git a/mod/forum/index.php b/mod/forum/index.php
index 3015e9e8dab..2fbd904cf0b 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -2,7 +2,7 @@
 
     require_once("../../config.php");
     require_once("lib.php");
-    require_once("$CFG->dirroot/rss/rsslib.php");
+    require_once("$CFG->libdir/rsslib.php");
 
     optional_variable($id);          // course
 
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 772d055f912..e68da7e5132 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -2,7 +2,7 @@
 
     require_once("../../config.php");
     require_once("lib.php");
-    require_once("$CFG->dirroot/rss/rsslib.php");
+    require_once("$CFG->libdir/rsslib.php");
 
     $id      = optional_param('id', 0, PARAM_INT);        // Course Module ID
     $f       = optional_param('f', 0, PARAM_INT);         // Forum ID
diff --git a/mod/glossary/index.php b/mod/glossary/index.php
index dbe1e62e731..75cfef5162c 100644
--- a/mod/glossary/index.php
+++ b/mod/glossary/index.php
@@ -5,7 +5,7 @@
 
     require_once("../../config.php");
     require_once("lib.php");
-    require_once("$CFG->dirroot/rss/rsslib.php");
+    require_once("$CFG->libdir/rsslib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 70c4ece6556..024eec1b321 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -2,7 +2,7 @@
 /// This page prints a particular instance of glossary
     require_once("../../config.php");
     require_once("lib.php");
-    require_once("$CFG->dirroot/rss/rsslib.php");
+    require_once("$CFG->libdir/rsslib.php");
 
     global $CFG, $THEME, $USER;
     $debug = 0;
diff --git a/rss/file.php b/rss/file.php
index d571db2ceb3..1574d2bcf86 100644
--- a/rss/file.php
+++ b/rss/file.php
@@ -16,8 +16,8 @@
     $nomoodlecookie = true;     // Because it interferes with caching
  
     require_once('../config.php');
-    require_once('../files/mimetypes.php');
-    require_once('rsslib.php');
+    require_once($CFG->dirroot.'/files/mimetypes.php');
+    require_once($CFG->libdir.'/rsslib.php');
 
 
     $lifetime = 3600;  // Seconds for files to remain in caches - 1 hour