diff --git a/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh b/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh
index c2c0502c..2ab0edc4 100755
--- a/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh
+++ b/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 LF_MAIN=CoapFederatedLF
 
 $REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o .
\ No newline at end of file
diff --git a/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh b/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh
index c2c0502c..2ab0edc4 100755
--- a/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh
+++ b/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 LF_MAIN=CoapFederatedLF
 
 $REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o .
\ No newline at end of file
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
index 152297f9..7be0e968 100644
--- a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
+++ b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
@@ -60,9 +60,8 @@ class UcMakeGeneratorFederated(
     val channelTypesCompileDefs =
         channelTypes.joinWithLn {
           when (it) {
-            NetworkChannelType.TCP_IP -> "CFLAGS += -DNETWORK_CHANNEL_TCP_RIOT"
-            NetworkChannelType.COAP_UDP_IP ->
-                "CFLAGS += -DNETWORK_CHANNEL_COAP_RIOT" // TODO: Abstract RIOT away!
+            NetworkChannelType.TCP_IP -> "CFLAGS += -DNETWORK_CHANNEL_TCP"
+            NetworkChannelType.COAP_UDP_IP -> "CFLAGS += -DNETWORK_CHANNEL_COAP"
             NetworkChannelType.NONE -> ""
             NetworkChannelType.CUSTOM -> ""
           }