diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 003cda15adc..58c7a586679 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -911,7 +911,7 @@ class page_requirements_manager {
         // As of IE8 + YUI3.1.1 the reference stylesheet (firstthemesheet) gets
         // ignored whenever another resource is added until such time as a redraw
         // is forced, usually by moving the mouse over the affected element.
-        $code = html_writer::tag('script', '/** Required in order to fix style inclusion problems in IE with YUI **/', $attributes+array('id'=>'firstthemesheet'));
+        $code = html_writer::tag('script', '/** Required in order to fix style inclusion problems in IE with YUI **/', array('id'=>'firstthemesheet', 'type'=>'text/css'));
 
         $urls = $this->cssthemeurls + $this->cssurls;
         foreach ($urls as $url) {
diff --git a/lib/tablelib.php b/lib/tablelib.php
index 49673bd06b6..49c04726df8 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -1025,6 +1025,7 @@ class flexible_table {
             $this->print_nothing_to_display();
         } else {
             echo '</table>';
+            echo html_writer::end_tag('div');
             $this->wrap_html_finish();
             // Paging bar
             if(in_array(TABLE_P_BOTTOM, $this->showdownloadbuttonsat)) {
@@ -1180,6 +1181,7 @@ class flexible_table {
         $this->wrap_html_start();
         // Start of main data table
 
+        echo html_writer::start_tag('div', array('class'=>'flexible-wrap'));
         echo '<table'.$this->make_attributes_string($this->attributes).'>';
 
     }
diff --git a/mod/assignment/styles.css b/mod/assignment/styles.css
index 9a9b74aa9cc..fc18aa215c1 100644
--- a/mod/assignment/styles.css
+++ b/mod/assignment/styles.css
@@ -10,6 +10,8 @@
 .path-mod-assignment .feedback .from {float: left;}
 .path-mod-assignment .files img {margin-right: 4px;}
 .path-mod-assignment .files a {white-space:nowrap;}
+.path-mod-assignment .flexible-wrap {width:100%;overflow:auto;}
+.path-mod-assignment .flexible-wrap > .flexible {margin:0;}
 
 /** Styles for submissions.php **/
 #page-mod-assignment-submissions form#options div {text-align:right;margin-left:auto;margin-right:20px;}