diff --git a/scripts/build.c.tests/build.tests b/scripts/build.c.tests/build.tests
index b810139..89c80ea 100644
--- a/scripts/build.c.tests/build.tests
+++ b/scripts/build.c.tests/build.tests
@@ -12,7 +12,7 @@ then
     echo "Building test programs..."
     do_cmd mkdir -p obj/tests || return 1
 
-    for SRC in src/@NAME@/*.cpp
+    for SRC in src/@NAME@/*.c
     do
         TEST="obj/tests/$(basename ${SRC} | sed -e 's,.c$,,')"
         MODIFIED=0
diff --git a/scripts/build.c.tests/template b/scripts/build.c.tests/template
index cde078e..f304a54 100644
--- a/scripts/build.c.tests/template
+++ b/scripts/build.c.tests/template
@@ -6,7 +6,7 @@
 */
 
 @TEST_HEADERS@
-#include <iostream>
+#include <stdio.h>
 
 
 
diff --git a/scripts/build.sdcc.firmware/build.firmware b/scripts/build.sdcc.firmware/build.firmware
index 33ce002..fbb6940 100644
--- a/scripts/build.sdcc.firmware/build.firmware
+++ b/scripts/build.sdcc.firmware/build.firmware
@@ -26,6 +26,7 @@ then
     then
         echo " Compiling..."
 
+	SDCCFLAGS="" # @TODO@
         do_cmd ${SDCC} ${SDCCFLAGS} -o "${@CNAME@}" ${SRC} ${EXTRAS} || return 1
 
         print_success "Firmware built"
diff --git a/scripts/build.sdcc.firmware/build.monolithic b/scripts/build.sdcc.firmware/build.monolithic
index 1475349..cd0120f 100644
--- a/scripts/build.sdcc.firmware/build.monolithic
+++ b/scripts/build.sdcc.firmware/build.monolithic
@@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1
diff --git a/scripts/release.sh b/scripts/release.sh
index 8f7f63e..9e7d760 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# @P@/scripts/release.sh
+# lw-build-system/scripts/release.sh
 #
-#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
 #  Released under the GNU GPLv2. See file COPYING or
 #  http://www.gnu.org/copyleft/gpl.html for details.
 #
@@ -22,13 +22,13 @@ source "${REPOS}/scripts/functions.sh" || exit 1
 # Get version etc.
 if [ $# -ne 2 ]
 then
-    echo "Usage: scripts/release.sh <version> <output_dir>"
+    echo "Usage: $0 <version> <output_dir>"
     exit 1
 fi
 VER=$1
 DIR=$2
 
-PKGNAME="@P@-${VER}"
+PKGNAME="$(basename ${REPOS})-${VER}"
 
 
 
@@ -76,5 +76,5 @@ gpg -a -b "${PKGNAME}-doc.tar.bz2"
 # clean up
 rm -rf "${PKGNAME}" "${PKGNAME}-doc"
 
-# kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: ts=4:sw=4:expandtab