diff --git a/Makefile b/Makefile
index 383782d..4fe0c33 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ N2N_OSNAME=$(shell uname -p)
 
 ########
 
-CC=gcc
+CC?=gcc
 DEBUG?=-g3
 #OPTIMIZATION?=-O2
 WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs
@@ -141,4 +141,4 @@ push:
 	fi
 
 .PHONY: steps build push
-# End Docker builder section
\ No newline at end of file
+# End Docker builder section
diff --git a/tuntap_freebsd.c b/tuntap_freebsd.c
index fc06f74..7404c95 100644
--- a/tuntap_freebsd.c
+++ b/tuntap_freebsd.c
@@ -20,7 +20,7 @@
 
 #ifdef __FreeBSD__
 
-void tun_close(tuntap_dev *device);
+void tuntap_close(tuntap_dev *device);
 
 /* ********************************** */
 
@@ -78,7 +78,7 @@ int tuntap_open(tuntap_dev *device /* ignored */,
 
     fd = popen(buf, "r");
     if(fd < 0) {
-      tun_close(device);
+      tuntap_close(device);
       return(-1);
     } else {
       int a, b, c, d, e, f;