diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 908929b5ba6..7872726e111 100644
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -747,7 +747,7 @@
                 } 
             }
         }
-        redirect("submissions.php?id=$cm->id&action=adminlist");
+        redirect("submissions.php?id=$cm->id&action=adminlist");
     }
     
 
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 8f82f5086f6..3cfaf2d1c14 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1212,10 +1212,13 @@ function workshop_compare_assessments($workshop, $assessment1, $assessment2) {
 //////////////////////////////////////////////////////////////////////////////////////
 function workshop_count_ungraded_assessments($workshop) {
     // function returns the number of ungraded assessments by students
+    global $CFG;
     
+    $timenow = time();
     $n = 0;
+    // get all the cold assessments that have not been graded
     if ($assessments = get_records_select("workshop_assessments", "workshopid = $workshop->id AND 
-            timegraded = 0")) {
+            (timecreated + $CFG->maxeditingtime) < $timenow AND timegraded = 0")) {
         foreach ($assessments as $assessment) {
             if (isstudent($workshop->course, $assessment->userid)) {
                 $n++;
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index 28f664456c4..92045ad6a27 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1247,7 +1247,7 @@ function workshop_list_submissions_for_admin($workshop, $order) {
                 }
                 $action .= " | <a href=\"submissions.php?action=adminconfirmdelete&amp;id=$cm->id&amp;sid=$submission->id\">".
                     get_string("delete", "workshop")."</a>";
-                $table->data[] = array(workshop_print_submission_title($workshop, $submission), $course->teacher, $action);
+                $table->data[] = array("<a href=\"submissions.php?action=editsubmission&amp;id=$cm->id&amp;sid=$submission->id\">$submission->title</a>", $course->teacher, $action);
             }
             print_heading(get_string("studentsubmissions", "workshop", $course->teacher), "center");
             print_table($table);