diff --git a/Lib/javascript/jsc/javascriptcode.swg b/Lib/javascript/jsc/javascriptcode.swg
index 672df8677..d7f5f5212 100644
--- a/Lib/javascript/jsc/javascriptcode.swg
+++ b/Lib/javascript/jsc/javascriptcode.swg
@@ -402,6 +402,7 @@ static JSStaticFunction $jsnspace_functions[] = {
 };
 
 static JSClassDefinition $jsnspace_classDefinition;
+static JSObjectRef $jsmangledname_object;
 %}
 
 /* -----------------------------------------------------------------------------
@@ -412,7 +413,7 @@ static JSClassDefinition $jsnspace_classDefinition;
 %{
   $jsmangledname_classDefinition.staticFunctions = $jsmangledname_functions;
   $jsmangledname_classDefinition.staticValues = $jsmangledname_values;
-  JSObjectRef $jsmangledname_object = JSObjectMake(context, JSClassCreate(&$jsmangledname_classDefinition), NULL);
+  $jsmangledname_object = JSObjectMake(context, JSClassCreate(&$jsmangledname_classDefinition), NULL);
 %}
 
 /* -----------------------------------------------------------------------------
diff --git a/Lib/javascript/jsc/javascriptprimtypes.swg b/Lib/javascript/jsc/javascriptprimtypes.swg
index 7e9898a24..814805b95 100644
--- a/Lib/javascript/jsc/javascriptprimtypes.swg
+++ b/Lib/javascript/jsc/javascriptprimtypes.swg
@@ -76,11 +76,12 @@ SWIG_From_dec(unsigned long)(unsigned long value)
 SWIGINTERN int
 SWIG_AsVal_dec(unsigned long)(JSValueRef obj, unsigned long *val)
 {
+  long longVal;
   if(!JSValueIsNumber(context, obj)) {
     return SWIG_TypeError;
   }
 
-  long longVal = (long) JSValueToNumber(context, obj, NULL);
+  longVal = (long) JSValueToNumber(context, obj, NULL);
 
   if(longVal < 0) {
       return SWIG_OverflowError;
@@ -142,11 +143,12 @@ SWIG_From_dec(unsigned long long)(unsigned long long value)
 SWIGINTERN int
 SWIG_AsVal_dec(unsigned long long)(JSValueRef obj, unsigned long long *val)
 {
+  long long longVal;
   if(!JSValueIsNumber(context, obj)) {
     return SWIG_TypeError;
   }
 
-  long long longVal = (unsigned long long) JSValueToNumber(context, obj, NULL);
+  longVal = (unsigned long long) JSValueToNumber(context, obj, NULL);
 
   if(longVal < 0) {
       return SWIG_OverflowError;
diff --git a/Lib/javascript/jsc/javascriptstrings.swg b/Lib/javascript/jsc/javascriptstrings.swg
index b3f46ae41..55c8e4b98 100644
--- a/Lib/javascript/jsc/javascriptstrings.swg
+++ b/Lib/javascript/jsc/javascriptstrings.swg
@@ -52,6 +52,7 @@ SWIG_JSC_FromCharPtrAndSize(JSContextRef context, const char* carray, size_t siz
       return JSValueMakeUndefined(context);
     } else {
       JSStringRef jsstring;
+      JSValueRef result;
       if(size < 2) {
         char c[2];
         int i;
@@ -63,7 +64,7 @@ SWIG_JSC_FromCharPtrAndSize(JSContextRef context, const char* carray, size_t siz
       } else {
         jsstring = JSStringCreateWithUTF8CString(carray);
       }
-      JSValueRef result = JSValueMakeString(context, jsstring);
+      result = JSValueMakeString(context, jsstring);
       JSStringRelease(jsstring);
       return result;
     }
diff --git a/Source/Modules/javascript.cxx b/Source/Modules/javascript.cxx
index 0c3f02a75..179ffb28c 100644
--- a/Source/Modules/javascript.cxx
+++ b/Source/Modules/javascript.cxx
@@ -1792,6 +1792,7 @@ int JSCEmitter::emitNamespaces() {
     namespace_definition.replace("$jsglobalvariables", variables)
 	.replace("$jsglobalfunctions", functions)
 	.replace("$jsnspace", name_mangled)
+	.replace("$jsmangledname", name_mangled)
 	.pretty_print(f_wrap_cpp);
 
     Template t_createNamespace(getTemplate("jsc_nspace_definition"));