diff --git a/openbsc/src/bsc_hack.c b/openbsc/src/bsc_hack.c
index dacaad3..14e5d86 100644
--- a/openbsc/src/bsc_hack.c
+++ b/openbsc/src/bsc_hack.c
@@ -237,6 +237,7 @@
 	bts_model_unknown_init();
 	bts_model_bs11_init();
 	bts_model_nanobts_init();
+	bts_model_rbs2k_init();
 
 	e1inp_init();
 
diff --git a/openbsc/src/bts_ericsson_rbs2000.c b/openbsc/src/bts_ericsson_rbs2000.c
index a0b5d97..484dba6 100644
--- a/openbsc/src/bts_ericsson_rbs2000.c
+++ b/openbsc/src/bts_ericsson_rbs2000.c
@@ -77,7 +77,7 @@
 {
 	struct e1inp_ts *e1i_ts = _line;
 
-	lapd_transmit_sabm(e1i_ts->driver.dahdi.lapd, 62, 62);
+	lapd_send_sabm(e1i_ts->driver.dahdi.lapd, 62, 62);
 
 	bsc_schedule_timer(&sabm_timer, 0, 50);
 }
@@ -93,12 +93,14 @@
 
 	switch (signal) {
 	case S_INP_TEI_UP:
+		bsc_del_timer(&sabm_timer);
 		switch (isd->link_type) {
 		case E1INP_SIGN_OML:
 			if (isd->trx->bts->type == GSM_BTS_TYPE_BS11)
 				bootstrap_om_rbs2k(isd->trx->bts);
 			break;
 		}
+		break;
 	case S_INP_LINE_INIT:
 		/* Right now Ericsson RBS are only supported on DAHDI */
 		if (strcasecmp(isd->line->driver->name, "DAHDI"))