diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c
index 60455b5..a18998f 100644
--- a/openbsc/src/gprs/gprs_sndcp.c
+++ b/openbsc/src/gprs/gprs_sndcp.c
@@ -911,6 +911,7 @@
 	case LL_DATA_CONF:
 	case LL_UNITDATA_IND:
 	case LL_STATUS_IND:
+	}
 }
 #endif
 
diff --git a/openbsc/src/gprs/gtphub.c b/openbsc/src/gprs/gtphub.c
index 83e17db..a1aaed2 100644
--- a/openbsc/src/gprs/gtphub.c
+++ b/openbsc/src/gprs/gtphub.c
@@ -553,7 +553,7 @@
 	}
 
 #if 1
-	/* TODO if (<loglevel is debug>) { ...
+	/* TODO if (<loglevel is debug>)
 	   (waiting for a commit from jerlbeck) */
 	int i;
 
diff --git a/openbsc/src/libcommon-cs/common_cs_vty.c b/openbsc/src/libcommon-cs/common_cs_vty.c
index 7f8b495..08a7581 100644
--- a/openbsc/src/libcommon-cs/common_cs_vty.c
+++ b/openbsc/src/libcommon-cs/common_cs_vty.c
@@ -163,7 +163,7 @@
 {
 	struct gsm_network *gsmnet = gsmnet_from_vty(vty);
 
-	gsmnet->a5_encryption= atoi(argv[0]);
+	gsmnet->a5_encryption = atoi(argv[0]);
 
 	return CMD_SUCCESS;
 }
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 742f803..1e25754 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -3759,7 +3759,7 @@
 }
 
 /*
- * This will be ran by the linker when loading the DSO. We use it to
+ * This will be run by the linker when loading the DSO. We use it to
  * do system initialization, e.g. registration of signal handlers.
  */
 static __attribute__((constructor)) void on_dso_load_0408(void)
diff --git a/openbsc/src/libmsc/osmo_msc.c b/openbsc/src/libmsc/osmo_msc.c
index 12a5117..2389980 100644
--- a/openbsc/src/libmsc/osmo_msc.c
+++ b/openbsc/src/libmsc/osmo_msc.c
@@ -131,7 +131,7 @@
 static struct bsc_api msc_handler = {
 	.sapi_n_reject = msc_sapi_n_reject,
 	.compl_l3 = msc_compl_l3,
-	.dtap  = msc_dtap,
+	.dtap = msc_dtap,
 	.clear_request = msc_clear_request,
 	.assign_compl = msc_assign_compl,
 	.assign_fail = msc_assign_fail,