diff --git a/lib/documentmanagement/DocumentCollaboration.inc b/lib/documentmanagement/DocumentCollaboration.inc
index 85637cf..9ddf4eb 100644
--- a/lib/documentmanagement/DocumentCollaboration.inc
+++ b/lib/documentmanagement/DocumentCollaboration.inc
@@ -75,11 +75,19 @@ class DocumentCollaboration {
 	*/
 	function resetDocumentCollaborationSteps($iDocumentID) {
 		global $default;
-		$sql = $default->db;		
-		if ($sql->query("UPDATE $default->folders_user_roles_table SET active = 0, done = 0 WHERE document_id = $iDocumentID")) {		
-			return true;
+        $aFieldValues = array(
+            'active' => 0,
+            'done' => 0,
+        );
+        $aWhereFieldValues = array(
+            'document_id' => $iDocumentID,
+        );
+        $res =& DBUtil::whereUpdate($default->folders_user_roles_table, $aFieldValues, $aWhereFieldValues);
+
+		if (PEAR::isError($res)) {
+            return false;
 		}
-		return false;
+        return true;
 	}
 	
 	/**
@@ -427,4 +435,4 @@ class DocumentCollaboration {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/session/Session.inc b/lib/session/Session.inc
index a2dd8eb..475154c 100644
--- a/lib/session/Session.inc
+++ b/lib/session/Session.inc
@@ -141,8 +141,14 @@ class Session {
                             }
                             
                             // update last used timestamp
-                            $sql->query("UPDATE $default->sessions_table SET lastused = '" . getCurrentDateTime() ."' " .
-                                        "WHERE user_id = $iUserID AND session_id = '$sessionID'");
+                            $aFV = array(
+                                'lastused' => getCurrentDateTime(),
+                            );
+                            $aWFV = array(
+                                'user_id' => $iUserID,
+                                'session_id' => $sessionID,
+                            );
+                            $res = DBUtil::whereUpdate($default->sessions_table, $aFV, $aWFV);
                             // add the array to the session
                             $_SESSION["sessionStatus"] = $sessionStatus;
                         } else {