diff --git a/src/gb_proxy.c b/src/gb_proxy.c
index 44a9008..da232e2 100644
--- a/src/gb_proxy.c
+++ b/src/gb_proxy.c
@@ -417,9 +417,9 @@
 			tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TMSI));
 			rc = gbprox_bss2sgsn_tlli(bss_bvc->cell, msg, &tlli, false);
 		} else if (TLVP_PRESENT(&tp, BSSGP_IE_IMSI)) {
-			// FIXME: Use the IMSI as selector?
+			/* FIXME: Use the IMSI as selector? */
 			rc = gbprox_bss2sgsn_tlli(bss_bvc->cell, msg, NULL, false);
-			//rc = gbprox_bss2sgsn_hashed(bss_bvc->cell, msg, NULL);
+			/* rc = gbprox_bss2sgsn_hashed(bss_bvc->cell, msg, NULL); */
 		} else
 			LOGPBVC(bss_bvc, LOGL_ERROR, "Rx RADIO-STATUS without any of the conditional IEs\n");
 		break;
diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c
index 1d9352d..7e94331 100644
--- a/src/gb_proxy_peer.c
+++ b/src/gb_proxy_peer.c
@@ -609,7 +609,7 @@
 
 	LOGPSGSN_CAT(sgsn, DOBJ, LOGL_INFO, "SGSN Destroying\n");
 	llist_del(&sgsn->list);
-	// talloc will free ->name and ->pool.nri_ranges
+	/* talloc will free ->name and ->pool.nri_ranges */
 	talloc_free(sgsn);
 }
 
@@ -728,23 +728,23 @@
 		return sgsn;
 	}
 
-	// TODO: We should keep track of count in cfg
+	/* TODO: We should keep track of count in cfg */
 	num_sgsns = llist_count(&cfg->sgsns);
 
 	if (num_sgsns == 0)
 		return NULL;
 
-	// FIXME: 256 SGSNs ought to be enough for everyone
+	/* FIXME: 256 SGSNs ought to be enough for everyone */
 	index = hash_32(tlli, 8) % num_sgsns;
 
-	// Get the first enabled SGSN after index
+	/* Get the first enabled SGSN after index */
 	llist_for_each_entry(sgsn, &cfg->sgsns, list) {
 		if (i >= index && sgsn->pool.allow_attach) {
 			return sgsn;
 		}
 		i++;
 	}
-	// Start again from the beginning
+	/* Start again from the beginning */
 	i = 0;
 	llist_for_each_entry(sgsn, &cfg->sgsns, list) {
 		if (i >= index) {