diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index 4487720d652..f1e287fba78 100755
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -81,7 +81,10 @@
     }
     if (scorm_external_link($sco->launch)) {
 	if ($version == 'AICC') {
-	    $result = $sco->launch.$connector.'aicc_sid='.$CFG->sesskey.'&aicc_url='.$CFG->wwwroot.'/mod/scorm/aicc.php&'.$sco->parameters;
+	    if (!empty($sco->parameters)) {
+		$sco->parameters = '&'. $sco->parameters;
+	    }
+	    $result = $sco->launch.$connector.'aicc_sid='.sesskey().'&aicc_url='.$CFG->wwwroot.'/mod/scorm/aicc.php'.$sco->parameters;
 	} else {
 	    $result = $sco->launch.$connector.$sco->parameters;
 	}
diff --git a/mod/scorm/playscorm.php b/mod/scorm/playscorm.php
index 745794afb86..d62e8a5a1e7 100755
--- a/mod/scorm/playscorm.php
+++ b/mod/scorm/playscorm.php
@@ -145,7 +145,7 @@
 	    <tr><td nowrap>  
 <?php
     $sco = scorm_display_structure($scorm,'scormlist',$currentorg,$scoid,$mode,true);
-    add_to_log($course->id, 'scorm', 'view', "reviewscorm.php?id=$cm->id&uid=$USER->id&scoid=$sco->id", "$scorm->id");
+    add_to_log($course->id, 'scorm', 'view', "playscorm.php?id=$cm->id&scoid=$sco->id", "$scorm->id");
 ?>
 	    </td></tr>
 	    <tr><td align="center">
@@ -161,7 +161,6 @@
     </td>
     <td class="fullscreen" height="90%">
     	<iframe name="main" class="fullscreen" height="640" src="loadSCO.php?id=<?php echo $cm->id.$scoidstring ?>"></iframe>
-    	<!--<iframe name="main" class="fullscreen" height="100%" src="loadSCO.php?id=<?php echo $cm->id.$scoidstring ?>"></iframe> -->
     </td></tr>
     </table>
 </body>