diff --git a/retriever/retriever.php b/retriever/retriever.php
index 60c9a2a2..5e7a783e 100644
--- a/retriever/retriever.php
+++ b/retriever/retriever.php
@@ -172,7 +172,7 @@ function retriever_retrieve_items($max_items) {
  */
 function retriever_clean_up_completed_resources($max_items) {
 	// TODO: figure out how to do this with DBA module
-	$r = q('SELECT retriever_resource.`id` as resource, retriever_item.`id` as item FROM retriever_resource, retriever_item, retriever_rule WHERE retriever_item.`finished` = 0 AND retriever_item.`resource` = retriever_resource.`id` AND retriever_resource.`completed` IS NOT NULL AND retriever_item.`contact-id` = retriever_rule.`contact-id` AND retriever_item.`item-uid` = retriever_rule.`uid` LIMIT %d',
+	$r = DBA::e('SELECT retriever_resource.`id` as resource, retriever_item.`id` as item FROM retriever_resource, retriever_item, retriever_rule WHERE retriever_item.`finished` = 0 AND retriever_item.`resource` = retriever_resource.`id` AND retriever_resource.`completed` IS NOT NULL AND retriever_item.`contact-id` = retriever_rule.`contact-id` AND retriever_item.`item-uid` = retriever_rule.`uid` LIMIT %d',
 	       intval($max_items));
 	if (!$r) {
 		$r = array();
@@ -209,10 +209,10 @@ function retriever_tidy() {
 	DBA::delete('retriever_resource', ['completed IS NOT NULL AND completed < DATE_SUB(now(), INTERVAL 1 WEEK)']);
 	DBA::delete('retriever_resource', ['completed IS NULL AND created < DATE_SUB(now(), INTERVAL 3 MONTH)']);
 
-	$r = q("SELECT retriever_item.id FROM retriever_item LEFT OUTER JOIN retriever_resource ON (retriever_item.resource = retriever_resource.id) WHERE retriever_resource.id is null");
+	$r = DBA::e("SELECT retriever_item.id FROM retriever_item LEFT OUTER JOIN retriever_resource ON (retriever_item.resource = retriever_resource.id) WHERE retriever_resource.id is null");
 	Logger::info('retriever_tidy: found ' . count($r) . ' retriever_items with no retriever_resource');
 	foreach ($r as $rr) {
-		q('DELETE FROM retriever_item WHERE id = %d', intval($rr['id']));
+		DBA::e('DELETE FROM retriever_item WHERE id = %d', intval($rr['id']));
 	}
 }