diff --git a/basis/furnace/recaptcha/example/example.factor b/basis/furnace/recaptcha/example/example.factor
index 6c2acc541e..80ee433bf0 100644
--- a/basis/furnace/recaptcha/example/example.factor
+++ b/basis/furnace/recaptcha/example/example.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors db.sqlite furnace.actions furnace.alloy
+USING: accessors sqlite.db2 furnace.actions furnace.alloy
 furnace.conversations furnace.recaptcha furnace.redirection
 html.templates.chloe.compiler http.server
 http.server.dispatchers http.server.responses io.streams.string
diff --git a/basis/orm/queries/queries.factor b/basis/orm/queries/queries.factor
index 1fa8881a11..c7ed193d44 100644
--- a/basis/orm/queries/queries.factor
+++ b/basis/orm/queries/queries.factor
@@ -104,10 +104,14 @@ M:: object delete-tuple-sql ( tuple -- statement )
         ] if
     ] each ;
 
+! XXX: include the assoc-filter?
 : filter-tuple-values ( persistent tuple -- assoc )
     [ columns>> ] dip
     2dup call-generators
-    '[ _ over getter>> call( obj -- slot-value ) ] { } map>assoc
+    '[ _ over getter>> call( obj -- slot-value ) ] { } map>assoc ;
+
+: filter-empty-tuple-values ( persistent tuple -- assoc )
+    filter-tuple-values
     [ nip ] assoc-filter ;
 
 ! : where-primary-key ( statement persistent tuple -- statement )
@@ -140,7 +144,7 @@ M:: object update-tuple-sql ( tuple -- statement )
 M: object select-tuple-sql ( tuple -- object )
     [ <select> ] dip
     [ >persistent ] [ ] bi {
-        [ filter-tuple-values [ first2 <column-binder-in> ] map >>in ]
+        [ filter-empty-tuple-values [ first2 <column-binder-in> ] map >>in ]
         [ drop columns>> [ <column-binder-out> ] map >>out ]
         [ drop 1array >>from ]
     } 2cleave ;
diff --git a/extra/site-watcher/site-watcher.factor b/extra/site-watcher/site-watcher.factor
index 49e90bff03..b9f554bc68 100644
--- a/extra/site-watcher/site-watcher.factor
+++ b/extra/site-watcher/site-watcher.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors timers arrays calendar combinators
 combinators.smart continuations debugger http.client fry
-init io.streams.string kernel locals math math.parser db
+init io.streams.string kernel locals math math.parser db2.connections
 namespaces sequences site-watcher.db site-watcher.email ;
 IN: site-watcher
 
diff --git a/extra/webapps/mason/backend/backend-tests.factor b/extra/webapps/mason/backend/backend-tests.factor
index 5025978d03..3b8ed918a7 100644
--- a/extra/webapps/mason/backend/backend-tests.factor
+++ b/extra/webapps/mason/backend/backend-tests.factor
@@ -7,7 +7,7 @@ IN: webapps.mason.backend.tests
 { 0 1 2 } [
     ! Do it in a with-transaction to simulate semantics of
     ! with-mason-db
-    "mason-test.db" <temp-sqlite-db> [
+    "resource:mason-test.db" <temp-sqlite-db> [
         [
             init-mason-db
 
diff --git a/extra/webapps/wiki/example/example.factor b/extra/webapps/wiki/example/example.factor
index 3b419e9a9c..8cfb907f7d 100644
--- a/extra/webapps/wiki/example/example.factor
+++ b/extra/webapps/wiki/example/example.factor
@@ -1,4 +1,4 @@
-USING: accessors calendar db db.tuples furnace.alloy
+USING: accessors calendar furnace.alloy db2.connections orm.tuples
 furnace.recaptcha.example http.server io.directories
 io.encodings.ascii io.files io.servers kernel namespaces sequences
 splitting webapps.utils webapps.wiki websites.concatenative ;