diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 4fbf337..7fdee05 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -43,7 +43,6 @@
 #include <openbsc/chan_alloc.h>
 #include <openbsc/meas_rep.h>
 #include <openbsc/db.h>
-#include <osmocom/core/talloc.h>
 #include <openbsc/vty.h>
 #include <osmocom/gprs/gprs_ns.h>
 #include <openbsc/system_information.h>
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index 816ae58..41291d9 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -51,6 +51,7 @@
 
 #include <osmocom/ctrl/control_cmd.h>
 #include <osmocom/ctrl/control_if.h>
+#include <osmocom/ctrl/ports.h>
 
 #include <osmocom/crypt/auth.h>
 
@@ -645,7 +646,7 @@
 
 
 /*
- * Update the auth status. This can be either a CIPHER MODE COMAMND or
+ * Update the auth status. This can be either a CIPHER MODE COMMAND or
  * a CM Serivce Accept. Maybe also LU Accept or such in the future.
  */
 static void update_con_authorize(struct nat_sccp_connection *con,
@@ -1655,7 +1656,7 @@
 		exit(1);
 	}
 
-	nat->ctrl = bsc_nat_controlif_setup(nat, 4250);
+	nat->ctrl = bsc_nat_controlif_setup(nat, OSMO_CTRL_PORT_BSC_NAT);
 	if (!nat->ctrl) {
 		fprintf(stderr, "Creating the control interface failed.\n");
 		exit(1);