diff --git a/openbsc/src/rtp_proxy.c b/openbsc/src/rtp_proxy.c
index 158145b75..a581b9fdf 100644
--- a/openbsc/src/rtp_proxy.c
+++ b/openbsc/src/rtp_proxy.c
@@ -57,7 +57,7 @@ struct rtcp_hdr {
 	
 #define RTCP_IE_CNAME	1
 
-/* iterate over all chunks in one RTCP message, kook for CNAME IEs and
+/* iterate over all chunks in one RTCP message, look for CNAME IEs and
  * replace all of those with 'new_cname' */
 static int rtcp_sdes_cname_mangle(struct msgb *msg, struct rtcp_hdr *rh,
 				  u_int16_t *rtcp_len, const char *new_cname)
diff --git a/openbsc/src/vty/command.c b/openbsc/src/vty/command.c
index 94a5c2af2..e9b3652fa 100644
--- a/openbsc/src/vty/command.c
+++ b/openbsc/src/vty/command.c
@@ -45,6 +45,7 @@ Boston, MA 02111-1307, USA.  */
 //#include "workqueue.h"
 
 #include <openbsc/gsm_data.h>
+#include <openbsc/gsm_subscriber.h>
 
 /* Command vector which includes some level of command lists. Normally
    each daemon maintains each own cmdvec. */
diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c
index 6962aa3bf..a248e6025 100644
--- a/openbsc/tests/db/db_test.c
+++ b/openbsc/tests/db/db_test.c
@@ -66,32 +66,32 @@ int main() {
 	struct gsm_subscriber *alice_db;
 
 	char *alice_imsi = "3243245432345";
-	alice = db_create_subscriber(alice_imsi);
+	alice = db_create_subscriber(NULL, alice_imsi);
 	db_sync_subscriber(alice);
-	alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice->imsi);
+	alice_db = db_get_subscriber(NULL, GSM_SUBSCRIBER_IMSI, alice->imsi);
 	COMPARE(alice, alice_db);
 	subscr_put(alice_db);
 	subscr_put(alice);
 
 	alice_imsi = "3693245423445";
-	alice = db_create_subscriber(alice_imsi);
+	alice = db_create_subscriber(NULL, alice_imsi);
 	db_subscriber_assoc_imei(alice, "1234567890");
 	db_subscriber_alloc_tmsi(alice);
 	alice->lac=42;
 	db_sync_subscriber(alice);
-	alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi);
+	alice_db = db_get_subscriber(NULL, GSM_SUBSCRIBER_IMSI, alice_imsi);
 	COMPARE(alice, alice_db);
 	subscr_put(alice);
 	subscr_put(alice_db);
 
 	alice_imsi = "9993245423445";
-	alice = db_create_subscriber(alice_imsi);
+	alice = db_create_subscriber(NULL, alice_imsi);
 	db_subscriber_alloc_tmsi(alice);
 	alice->lac=42;
 	db_sync_subscriber(alice);
 	db_subscriber_assoc_imei(alice, "1234567890");
 	db_subscriber_assoc_imei(alice, "6543560920");
-	alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice_imsi);
+	alice_db = db_get_subscriber(NULL, GSM_SUBSCRIBER_IMSI, alice_imsi);
 	COMPARE(alice, alice_db);
 	subscr_put(alice);
 	subscr_put(alice_db);