diff --git a/src/abis_nm.c b/src/abis_nm.c
index 9db2936f8..93cd0fce6 100644
--- a/src/abis_nm.c
+++ b/src/abis_nm.c
@@ -1249,12 +1249,18 @@ static int abis_nm_rcvmsg_sw(struct msgb *mb)
 			break;
 		}
 	case SW_STATE_NONE:
+		switch (foh->msg_type) {
+		case NM_MT_ACTIVATE_SW_ACK:
+			rc = 0;
+			break;
+		}
+		break;
 	case SW_STATE_ERROR:
 		break;
 	}
 
 	if (rc)
-		fprintf(stderr, "unexpected NM MT 0x%02x in state %u -> %u\n",
+		DEBUGP(DNM, "unexpected NM MT 0x%02x in state %u -> %u\n",
 			foh->msg_type, old_state, sw->state);
 
 	return rc;
diff --git a/src/bsc_hack.c b/src/bsc_hack.c
index f1142cc7f..cd3ca4144 100644
--- a/src/bsc_hack.c
+++ b/src/bsc_hack.c
@@ -391,8 +391,6 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
 						      NM_STATE_UNLOCKED);
 			}
 			break;
-		case NM_OC_RADIO_CARRIER:
-			break;
 		case NM_OC_CHANNEL:
 			ts = obj;
 			trx = ts->trx;
@@ -408,13 +406,12 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
 						      NM_STATE_UNLOCKED);
 			}
 			break;
-		case NM_OC_BASEB_TRANSC:
-			trx = container_of(obj, struct gsm_bts_trx, bb_transc);
+		default:
 			break;
 		}
 		break;
-	case EVT_STATECHG_ADM:
-		DEBUGP(DMM, "Unhandled state change in %s:%d\n", __func__, __LINE__);
+	default:
+		//DEBUGP(DMM, "Unhandled state change in %s:%d\n", __func__, __LINE__);
 		break;
 	}
 	return 0;