diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index 0eecd4a4aa..c6b71e4e37 100755
--- a/tools/fmt-bindings
+++ b/tools/fmt-bindings
@@ -31,7 +31,7 @@ GetOptions ("platform=s" => \$platform,
 
 if ($platform eq "darwin") {
 
-    $gtk_modifier_map{'PRIMARY'} = 'Meta';
+    $gtk_modifier_map{'PRIMARY'} = 'Primary';
     $gtk_modifier_map{'SECONDARY'} = 'Control';
     $gtk_modifier_map{'TERTIARY'} = 'Shift';
     $gtk_modifier_map{'LEVEL4'} = 'Mod1';
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 2fa6c6d460..b4f78f9c6a 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -296,9 +296,11 @@ cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners
     for f in *.preset ; do 
 	echo ExportFormat: $f; cp "$f" ../tools/osx_packaging/$ExportFormats ; 
 done)
-(cd $BUILD_ROOT/templates && \
+(cd $BUILD_ROOT/../templates && \
     for f in * ; do 
-	echo Template: $f ; cp -r "$f" ../../tools/osx_packaging/$Templates ; 
+	if [ -d "$f" ] ; then
+	    echo Template: $f ; cp -r "$f" ../tools/osx_packaging/$Templates ; 
+	fi
 done)
 
 # MIDI maps