diff --git a/src/Mod/OpenSCAD/InitGui.py b/src/Mod/OpenSCAD/InitGui.py
index d21c2d39b..7339c1164 100644
--- a/src/Mod/OpenSCAD/InitGui.py
+++ b/src/Mod/OpenSCAD/InitGui.py
@@ -94,8 +94,11 @@ static char * openscadlogo_xpm[] = {
     ToolTip = "OpenSCAD workbench"
     def Initialize(self):
         import OpenSCAD_rc,OpenSCADCommands
-        commands=['ReplaceObject','RemoveSubtree','RefineShapeFeature',"Edgestofaces",'ExpandPlacements']
-        toolbarcommands=['ReplaceObject','RemoveSubtree','RefineShapeFeature']
+        commands=['OpenSCAD_ReplaceObject','OpenSCAD_RemoveSubtree',\
+            'OpenSCAD_RefineShapeFeature',"OpenSCAD_Edgestofaces",\
+            'OpenSCAD_ExpandPlacements']
+        toolbarcommands=['OpenSCAD_ReplaceObject','OpenSCAD_RemoveSubtree',\
+            'OpenSCAD_RefineShapeFeature']
         import PartGui
         parttoolbarcommands = ['Part_CheckGeometry',"Part_Primitives",\
             "Part_Builder",'Part_Cut','Part_Fuse','Part_Common',\
@@ -105,8 +108,8 @@ static char * openscadlogo_xpm[] = {
             "User parameter:BaseApp/Preferences/Mod/OpenSCAD")
         openscadfilename = param.GetString('openscadexecutable')
         if openscadfilename:
-            commands.extend(['AddOpenSCADElement'])
-            toolbarcommands.extend(['AddOpenSCADElement'])
+            commands.extend(['OpenSCAD_AddOpenSCADElement'])
+            toolbarcommands.extend(['OpenSCAD_AddOpenSCADElement'])
         self.appendToolbar("OpenSCADTools",toolbarcommands)
         self.appendMenu('OpenSCAD',commands)
         self.appendToolbar('OpenSCAD Part tools',parttoolbarcommands)
diff --git a/src/Mod/OpenSCAD/OpenSCADCommands.py b/src/Mod/OpenSCAD/OpenSCADCommands.py
index a6651a8fe..93b9f8d92 100644
--- a/src/Mod/OpenSCAD/OpenSCADCommands.py
+++ b/src/Mod/OpenSCAD/OpenSCADCommands.py
@@ -143,9 +143,9 @@ class AddSCADWidget(QtGui.QWidget):
     def __init__(self,*args):
         QtGui.QWidget.__init__(self,*args)
         self.textEdit=QtGui.QTextEdit()
-        self.buttonadd = QtGui.QPushButton(translate('OpenSCAD',u'Add'))
-        self.buttonclear = QtGui.QPushButton(translate('OpenSCAD',u'Clear'))
-        self.checkboxmesh = QtGui.QCheckBox(translate('OpenSCAD',u'as Mesh'))
+        self.buttonadd = QtGui.QPushButton(translate('OpenSCAD','Add'))
+        self.buttonclear = QtGui.QPushButton(translate('OpenSCAD','Clear'))
+        self.checkboxmesh = QtGui.QCheckBox(translate('OpenSCAD','as Mesh'))
         layouth=QtGui.QHBoxLayout()
         layouth.addWidget(self.buttonadd)
         layouth.addWidget(self.buttonclear)
@@ -154,15 +154,15 @@ class AddSCADWidget(QtGui.QWidget):
         layout.addWidget(self.checkboxmesh)
         layout.addWidget(self.textEdit)
         self.setLayout(layout)
-        self.setWindowTitle(translate('OpenSCAD',u'Add OpenSCAD Element'))
+        self.setWindowTitle(translate('OpenSCAD','Add OpenSCAD Element'))
         self.textEdit.setText(u'cube();')
         self.buttonclear.clicked.connect(self.textEdit.clear)
 
     def retranslateUi(self, widget=None):
-        self.buttonadd.setText(translate('OpenSCAD',u'Add'))
-        self.buttonclear.setText(translate('OpenSCAD',u'Clear'))
-        self.checkboxmesh.setText(translate('OpenSCAD',u'as Mesh'))
-        self.setWindowTitle(translate('OpenSCAD',u'Add OpenSCAD Element'))
+        self.buttonadd.setText(translate('OpenSCAD','Add'))
+        self.buttonclear.setText(translate('OpenSCAD','Clear'))
+        self.checkboxmesh.setText(translate('OpenSCAD','as Mesh'))
+        self.setWindowTitle(translate('OpenSCAD','Add OpenSCAD Element'))
 
 class AddSCADTask:
     def __init__(self):
@@ -210,10 +210,10 @@ class AddOpenSCADElement:
                 'Add an OpenSCAD element by entering OpenSCAD code and executing the OpenSCAD binary')}
 
 
-FreeCADGui.addCommand('ColorCodeShape',ColorCodeShape())
-FreeCADGui.addCommand('Edgestofaces',Edgestofaces())
-FreeCADGui.addCommand('RefineShapeFeature',RefineShapeFeature())
-FreeCADGui.addCommand('ExpandPlacements',ExpandPlacements())
-FreeCADGui.addCommand('ReplaceObject',ReplaceObject())
-FreeCADGui.addCommand('RemoveSubtree',RemoveSubtree())
-FreeCADGui.addCommand('AddOpenSCADElement',AddOpenSCADElement())
+FreeCADGui.addCommand('OpenSCAD_ColorCodeShape',ColorCodeShape())
+FreeCADGui.addCommand('OpenSCAD_Edgestofaces',Edgestofaces())
+FreeCADGui.addCommand('OpenSCAD_RefineShapeFeature',RefineShapeFeature())
+FreeCADGui.addCommand('OpenSCAD_ExpandPlacements',ExpandPlacements())
+FreeCADGui.addCommand('OpenSCAD_ReplaceObject',ReplaceObject())
+FreeCADGui.addCommand('OpenSCAD_RemoveSubtree',RemoveSubtree())
+FreeCADGui.addCommand('OpenSCAD_AddOpenSCADElement',AddOpenSCADElement())
diff --git a/src/Mod/OpenSCAD/exportCSG.py b/src/Mod/OpenSCAD/exportCSG.py
index 13878ad0a..220a2ff8c 100644
--- a/src/Mod/OpenSCAD/exportCSG.py
+++ b/src/Mod/OpenSCAD/exportCSG.py
@@ -90,7 +90,7 @@ def vertexs2polygon(vertex):
 
 def shape2polyhedron(shape):
     import MeshPart
-fa = params.GetFloat('exportFa',12.0)
+    fa = params.GetFloat('exportFa',12.0)
     return mesh2polyhedron(MeshPart.meshFromShape(shape,params.GetFloat(\
         'meshmaxlength',1.0), params.GetFloat('meshmaxarea',0.0),\
          params.GetFloat('meshlocallen',0.0),\
diff --git a/src/WindowsInstaller/ModOpenSCAD.wxi b/src/WindowsInstaller/ModOpenSCAD.wxi
index c362cad53..def24ebbe 100644
--- a/src/WindowsInstaller/ModOpenSCAD.wxi
+++ b/src/WindowsInstaller/ModOpenSCAD.wxi
@@ -38,7 +38,7 @@
             <File Id="replaceobjpy" Name="replaceobj.py" DiskId="1" />
             <File Id="tokrulespy" Name="tokrules.py" DiskId="1" />
         </Component>
-		<Directory Id="ModOpenSCADPly" Name="OpenSCADPly" FileSource="../../Mod/OpenSCAD/ply">
+		<Directory Id="ModOpenSCADPly" Name="ply" FileSource="../../Mod/OpenSCAD/ply">
 	        <Component Id="CompModOpenSCADPly" Guid="870b896b-30f8-4d3b-b923-36536c0c2859" Win64='$(var.Win_64)' KeyPath="yes">
 	            <File Id="OpenSCADLibInitPy" Name="__init__.py" DiskId="1" />
 	            <File Id="OpenSCADLibREADME" Name="README" DiskId="1" />