diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index ab5ebec512f..8df885fe641 100755
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -120,22 +120,23 @@ class data_field_file extends data_field_base {// extends
 
     function display_browse_field($fieldid, $recordid, $template) {
 
-        global $CFG, $USER, $course;
+        global $CFG, $USER;
 
         $field = get_record('data_fields', 'id', $fieldid);
-
+        $data = get_record('data', 'id', $field->dataid);
+        
         if ($content = get_record('data_content', 'fieldid', $fieldid, 'recordid', $recordid)){
             $contents[0] = $content->content;
             $contents[1] = $content->content1;
             
             $src = empty($contents[0])? '':$contents[0];
             $name = empty($contents[1])? $src:$contents[1];
-
+            
             
             if ($CFG->slasharguments) {
-                $source = $CFG->wwwroot.'/file.php/'.$course->id.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
+                $source = $CFG->wwwroot.'/file.php/'.$data->course.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
             } else {
-                $source = $CFG->wwwroot.'/file.php?file=/'.$course->id.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
+                $source = $CFG->wwwroot.'/file.php?file=/'.$data->course.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
             }
 
             $width = $field->param1 ? ' width = "'.$field->param1.'" ':' ';
diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php
index bd033a783dc..29e9443bd0f 100755
--- a/mod/data/field/picture/field.class.php
+++ b/mod/data/field/picture/field.class.php
@@ -112,10 +112,11 @@ class data_field_picture extends data_field_file {// extends
     }
 
     function display_browse_field($fieldid, $recordid, $template) {
-        global $CFG, $USER, $course;
-
+        global $CFG, $USER;
+        
         $field = get_record('data_fields', 'id', $fieldid);
-
+        $data = get_record('data', 'id', $field->dataid);
+        
         if ($content = get_record('data_content', 'fieldid', $fieldid, 'recordid', $recordid)){
             if (isset($content->content)){
                 $contents[0] = $content->content;
@@ -127,9 +128,9 @@ class data_field_picture extends data_field_file {// extends
             $src = empty($contents[0])? '':$contents[0];
 
             if ($CFG->slasharguments) {
-                $source = $CFG->wwwroot.'/file.php/'.$course->id.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
+                $source = $CFG->wwwroot.'/file.php/'.$data->course.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
             } else {
-                $source = $CFG->wwwroot.'/file.php?file=/'.$course->id.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
+                $source = $CFG->wwwroot.'/file.php?file=/'.$data->course.'/'.$CFG->moddata.'/data/'.$field->dataid.'/'.$field->id.'/'.$recordid;
             }
 
             if ($template == 'listtemplate') {
diff --git a/mod/data/rsslib.php b/mod/data/rsslib.php
index d6055a05372..e19be46e1ba 100644
--- a/mod/data/rsslib.php
+++ b/mod/data/rsslib.php
@@ -35,7 +35,7 @@
                         
                         // Get the data_records out.
                         $sql = 'SELECT dr.* ' .
-                                    'FROM data_records AS dr ' .
+                                    "FROM {$CFG->prefix}data_records AS dr " .
                                     "WHERE dr.dataid = {$dataActivity->id} " .
                                     'ORDER BY dr.timecreated DESC ' .
                                     "LIMIT {$dataActivity->rssarticles}";