diff --git a/compile_all.py b/compile_all.py
index bd1fedf..c89a44e 100755
--- a/compile_all.py
+++ b/compile_all.py
@@ -104,10 +104,11 @@ def main(argv):
 
     argparser.add_argument('-v', '--verbose', action='count')
     argparser.add_argument('-i', '--include', action='append')
-    argparser.add_argument('-t', '--template', default='templates/linux')
+    argparser.add_argument('-t', '--template', required=True)
     argparser.add_argument('-b', '--build-dir', default='build')
     argparser.add_argument('-s', '--submissions-dir',
-                           default='all-lwc-submission-files')
+                           default='all-lwc-submission-files',
+                           required=True)
 
     args = argparser.parse_args(argv[1:])
     template_dir = args.template
diff --git a/templates/bluepill/test b/templates/bluepill/test.py
similarity index 100%
rename from templates/bluepill/test
rename to templates/bluepill/test.py
diff --git a/templates/esp32/test b/templates/esp32/test.py
similarity index 100%
rename from templates/esp32/test
rename to templates/esp32/test.py
diff --git a/templates/f1-libopencm3/Makefile b/templates/f1-libopencm3/Makefile
index d83b6af..a5f2b23 100644
--- a/templates/f1-libopencm3/Makefile
+++ b/templates/f1-libopencm3/Makefile
@@ -75,7 +75,7 @@ STYLECHECKFLAGS	:= --no-tree -f --terse --mailback
 STYLECHECKFILES	:= $(shell find . -name '*.[ch]')
 OPT		:= -O2
 #DEBUG		:= -ggdb3
-CSTD		?= -std=c99
+CSTD		?= -std=gnu99
 
 
 ###############################################################################
diff --git a/templates/f1-libopencm3/test b/templates/f1-libopencm3/test.py
similarity index 100%
rename from templates/f1-libopencm3/test
rename to templates/f1-libopencm3/test.py
diff --git a/templates/f7/test b/templates/f7/test.py
similarity index 100%
rename from templates/f7/test
rename to templates/f7/test.py
diff --git a/templates/maixduino/test b/templates/maixduino/test.py
similarity index 100%
rename from templates/maixduino/test
rename to templates/maixduino/test.py
diff --git a/templates/uno/test b/templates/uno/test.py
similarity index 100%
rename from templates/uno/test
rename to templates/uno/test.py
diff --git a/test-dude.py b/test-scheduler.py
similarity index 99%
rename from test-dude.py
rename to test-scheduler.py
index 370369f..e8480fe 100644
--- a/test-dude.py
+++ b/test-scheduler.py
@@ -74,7 +74,7 @@ class Runner(threading.Thread):
 
     def __init__(self, template, platform, program=None):
         if program is None:
-            program = ['python3', './templates/%s/test' % template]
+            program = ['python3', './templates/%s/test.py' % template]
 
         self.id = str(Runner._next_id)
         Runner._next_id += 1