diff --git a/ykval-checksum-clients.php b/ykval-checksum-clients.php
index 67f8085..7bc2b1d 100755
--- a/ykval-checksum-clients.php
+++ b/ykval-checksum-clients.php
@@ -41,16 +41,18 @@ $everything = "";
 $result=$db->customQuery("SELECT id, active, secret ".
 			 "FROM clients ".
 			 "ORDER BY id");
-while($row = $result->fetch(PDO::FETCH_ASSOC)) {
-  if ($row['active'] == "") {
+while($row = $this->db->fetchArray($result)) {
+  $active = $this->db->getRowValue($row, 'active');
+  if ($active == "") {
     # For some reason PostgreSQL returns empty strings for false values?!
-    $row['active'] = "0";
+    $active = "0";
   }
   $everything = $everything .
-    $row['id'] . "\t" . $row['active'] . "\t" . $row['secret'] .
-    "\n";
+    $this->db->getRowValue($row, 'id') . "\t" . $active . "\t" .
+    $this->db->getRowValue($row, 'secret') . "\n";
 }
 
+$this->db->closeCursor($result);
 $hash = sha1 ($everything);
 
 if ($verbose) {
diff --git a/ykval-config.php b/ykval-config.php
index 4a98ead..28c8f82 100644
--- a/ykval-config.php
+++ b/ykval-config.php
@@ -2,7 +2,7 @@
 
 # For the validation interface.
 $baseParams = array ();
-$baseParams['__YKVAL_DB_DSN__'] = "mysql:dbname=ykval;host=127.0.0.1";
+$baseParams['__YKVAL_DB_DSN__'] = "mysql:dbname=ykval;host=127.0.0.1"; # "oci:oracledb" for Oracle DB (with OCI library)
 $baseParams['__YKVAL_DB_USER__'] = 'ykval_verifier';
 $baseParams['__YKVAL_DB_PW__'] = 'lab';
 $baseParams['__YKVAL_DB_OPTIONS__'] = array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION);
diff --git a/ykval-export.php b/ykval-export.php
index 8d25a1d..1fe6c76 100755
--- a/ykval-export.php
+++ b/ykval-export.php
@@ -22,22 +22,24 @@ if (!$db->connect()) {
  }
 
 $result=$db->customQuery("SELECT active, created, modified, yk_publicname, yk_counter, yk_use, yk_low, yk_high, nonce, notes FROM yubikeys ORDER BY yk_publicname");
-while($row = $result->fetch(PDO::FETCH_ASSOC)){
-  echo $row['active'] .
-    "\t" . $row['created'] .
-    "\t" . $row['modified'] .
-    "\t" . $row['yk_publicname'] .
-    "\t" . $row['yk_counter'] .
-    "\t" . $row['yk_use'] .
-    "\t" . $row['yk_low'] .
-    "\t" . $row['yk_high'] .
-    "\t" . $row['nonce'] .
-    "\t" . $row['notes'] .
+while($row = $db->fetchArray($result)){
+  echo     $db->getRowValue($row, 'active') .
+    "\t" . $db->getRowValue($row, 'created') .
+    "\t" . $db->getRowValue($row, 'modified') .
+    "\t" . $db->getRowValue($row, 'yk_publicname') .
+    "\t" . $db->getRowValue($row, 'yk_counter') .
+    "\t" . $db->getRowValue($row, 'yk_use') .
+    "\t" . $db->getRowValue($row, 'yk_low') .
+    "\t" . $db->getRowValue($row, 'yk_high') .
+    "\t" . $db->getRowValue($row, 'nonce') .
+    "\t" . $db->getRowValue($row, 'notes') .
     "\n";
  }
 
+$db->closeCursor($result);
+$db->disconnect();
 $result=null;
 $db=null;
 
 
-?>
\ No newline at end of file
+?>
diff --git a/ykval-import.php b/ykval-import.php
index 49d696f..636b741 100755
--- a/ykval-import.php
+++ b/ykval-import.php
@@ -38,7 +38,7 @@ while ($res=fgetcsv(STDIN, 0, "\t")) {
 
   $query="SELECT * FROM yubikeys WHERE yk_publicname='" . $params['yk_publicname'] . "'";
   $result=$db->customQuery($query);
-  if($result->fetch(PDO::FETCH_ASSOC)) {
+  if($db->rowCount($result)) {
     $query="UPDATE yubikeys SET " .
       "active='" . $params["active"] . "' " .
       ",created='" . $params["created"] . "' " .
diff --git a/ykval-synclib.php b/ykval-synclib.php
index 7e8645d..d5ff097 100644
--- a/ykval-synclib.php
+++ b/ykval-synclib.php
@@ -56,9 +56,9 @@ class SyncLib
 
   function getClientData($client)
   {
-    $res=$this->db->customQuery("SELECT id, secret FROM clients WHERE active AND id='" . $client . "'");
-    $r = $res->fetch(PDO::FETCH_ASSOC);
-    $res->closeCursor();
+    $res = $this->db->customQuery("SELECT id, secret FROM clients WHERE active='1' AND id='" . $client . "'");
+    $r = $this->db->fetchArray($res);
+    $this->db->closeCursor($res);
     if ($r) return $r;
     else return false;
   }
@@ -143,7 +143,7 @@ class SyncLib
   function getLocalParams($yk_publicname)
   {
     $this->log(LOG_INFO, "searching for yk_publicname " . $yk_publicname . " in local db");
-    $res = $this->db->findBy('yubikeys', 'yk_publicname', $yk_publicname,1);
+    $res = $this->db->findBy('yubikeys', 'yk_publicname', $yk_publicname, 1);
 
     if (!$res) {
       $this->log(LOG_NOTICE, 'Discovered new identity ' . $yk_publicname);
@@ -160,14 +160,14 @@ class SyncLib
       $res=$this->db->findBy('yubikeys', 'yk_publicname', $yk_publicname,1);
     }
     if ($res) {
-      $localParams=array('modified'=>$res['modified'],
-			 'nonce'=>$res['nonce'],
-			 'active'=>$res['active'],
-			 'yk_publicname'=>$yk_publicname,
-			 'yk_counter'=>$res['yk_counter'],
-			 'yk_use'=>$res['yk_use'],
-			 'yk_high'=>$res['yk_high'],
-			 'yk_low'=>$res['yk_low']);
+      $localParams=array('modified' => $this->db->getRowValue($res, 'modified'),
+			 'nonce' => $this->db->getRowValue($res, 'nonce'),
+			 'active' => $this->db->getRowValue($res, 'active'),
+			 'yk_publicname' => $yk_publicname,
+			 'yk_counter' => $this->db->getRowValue($res, 'yk_counter'), 
+			 'yk_use' => $this->db->getRowValue($res, 'yk_use'),
+			 'yk_high' => $this->db->getRowValue($res, 'yk_high'),
+			 'yk_low' => $this->db->getRowValue($res, 'yk_low'));
 
       $this->log(LOG_INFO, "yubikey found in db ", $localParams);
       return $localParams;
@@ -289,20 +289,19 @@ class SyncLib
     $this->log(LOG_INFO, 'starting resync');
     /* Loop over all unique servers in queue */
     $queued_limit=time()-$older_than;
-    $res=$this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null");
+    $server_res=$this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null");
 
-    foreach ($res as $my_server) {
-      $this->log(LOG_INFO, "Sending queue request to server on server " . $my_server['server']);
-      $res=$this->db->customQuery("select * from queue WHERE (queued < " . $queued_limit . " or queued is null) and server='" . $my_server['server'] . "'");
+
+    while ($my_server=$this->db->fetchArray($server_res)) {
+      $this->log(LOG_INFO, "Sending queue request to server on server " . $this->db->getRowValue($my_server, 'server'));
+      $res=$this->db->customQuery("select * from queue WHERE (queued < " . $queued_limit . " or queued is null) and server='" . $this->db->getRowValue($my_server, 'server') . "'");
       $ch = curl_init();
-
-      while ($entry=$res->fetch(PDO::FETCH_ASSOC)) {
-	$this->log(LOG_INFO, "server=" . $entry['server'] . " , info=" . $entry['info']);
-	$url=$entry['server'] .
-	  "?otp=" . $entry['otp'] .
-	  "&modified=" . $entry['modified'] .
-	  "&" . $this->otpPartFromInfoString($entry['info']);
-
+      while ($entry=$this->db->fetchArray($res)) {
+	$this->log(LOG_INFO, "server=" . $this->db->getRowValue($entry, 'server') . " , info=" . $this->db->getRowValue($entry, 'info'));
+	$url=$this->db->getRowValue($entry, 'server') .  
+	  "?otp=" . $this->db->getRowValue($entry, 'otp') .
+	  "&modified=" . $this->db->getRowValue($entry, 'modified') .
+	  "&" . $this->otpPartFromInfoString($this->db->getRowValue($entry, 'info'));
 
 	/* Send out sync request */
 	$this->log(LOG_DEBUG, 'url is ' . $url);
@@ -315,7 +314,7 @@ class SyncLib
 	$response = curl_exec($ch);
 
 	if ($response==False) {
-	  $this->log(LOG_NOTICE, 'Timeout. Stopping queue resync for server ' . $my_server['server']);
+	  $this->log(LOG_NOTICE, 'Timeout. Stopping queue resync for server ' . $this->db->getRowValue($entry, 'server'));
 	  break;
 	}
 
@@ -328,8 +327,8 @@ class SyncLib
 
 	  /* Retrieve info from entry info string */
 
-	  $validationParams=$this->localParamsFromInfoString($entry['info']);
-	  $otpParams=$this->otpParamsFromInfoString($entry['info']);
+	  $validationParams=$this->localParamsFromInfoString($this->db->getRowValue($entry, 'info'));
+	  $otpParams=$this->otpParamsFromInfoString($this->db->getRowValue($entry, 'info'));
 	  $localParams=$this->getLocalParams($otpParams['yk_publicname']);
 
 	  $this->log(LOG_DEBUG, "validation params: ", $validationParams);
@@ -362,21 +361,22 @@ class SyncLib
 	}
 
 	  /* Deletion */
-	  $this->log(LOG_INFO, 'deleting queue entry with modified=' . $entry['modified'] .
-		     ' server_nonce=' . $entry['server_nonce'] .
-		     ' server=' . $entry['server']);
+	  $this->log(LOG_INFO, 'deleting queue entry with modified=' . $this->db->getRowValue($entry, 'modified') .
+	    ' server_nonce=' . $this->db->getRowValue($entry, 'server_nonce') .
+	    ' server=' . $this->db->getRowValue($entry, 'server'));
 	  $this->db->deleteByMultiple('queue',
-				      array("modified"=>$entry['modified'],
-					    "server_nonce"=>$entry['server_nonce'],
-					    'server'=>$entry['server']));
+	    array("modified"=>$this->db->getRowValue($entry, 'modified'),
+	    "server_nonce"=>$this->db->getRowValue($entry, 'server_nonce'), 
+	    'server'=>$this->db->getRowValue($entry, 'server')));
 	} else {
 	  $this->log(LOG_ERR, "Remote server refused our sync request. Check remote server logs.");
 	}
 
       } /* End of loop over each queue entry for a server */
-    curl_close($ch);
-    $res->closeCursor();
+      curl_close($ch);
+      $this->db->closeCursor($res);
     } /* End of loop over each distinct server in queue */
+    $this->db->closeCursor($server_res);
     return true;
   }
 
@@ -388,11 +388,11 @@ class SyncLib
 
     $urls=array();
     $res=$this->db->findByMultiple('queue', array("modified"=>$this->otpParams['modified'], "server_nonce"=>$this->server_nonce));
-    foreach ($res as $row) {
-      $urls[]=$row['server'] .
-	"?otp=" . $row['otp'] .
-	"&modified=" . $row['modified'] .
-	"&" . $this->otpPartFromInfoString($row['info']);
+    while ($row = $this->db->fetchArray($res)) {
+      $urls[]=$this->db->getRowValue($row, 'server') .  
+	"?otp=" . $this->db->getRowValue($row, 'otp') .
+	"&modified=" . $this->db->getRowValue($row, 'modified') .
+	"&" . $this->otpPartFromInfoString($this->db->getRowValue($row, 'info'));
     }
 
     /*
diff --git a/ykval-verify.php b/ykval-verify.php
index 21516c6..085427f 100644
--- a/ykval-verify.php
+++ b/ykval-verify.php
@@ -11,7 +11,7 @@ $myLog = new Log('ykval-verify');
 $myLog->addField('ip', $_SERVER['REMOTE_ADDR']);
 $myLog->log(LOG_INFO, "Request: " . $_SERVER['QUERY_STRING'] .
 	    " (at " . date("c") . " " . microtime() . ") " .
-	    (isset($_SERVER["HTTPS"]) == TRUE ? ($_SERVER["HTTPS"] == "on" ? "HTTPS" : "HTTP") : "HTTP"));
+	    (isset($_SERVER["HTTPS"])  && $_SERVER["HTTPS"] == "on" ? "HTTPS" : "HTTP"));
 
 /* Detect protocol version */
 if (preg_match("/\/wsapi\/([0-9]+)\.([0-9]+)\//", $_SERVER['REQUEST_URI'], $out)) {