diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py
index b936cba236..ceb1fda4fd 100644
--- a/src/Mod/Arch/ArchCommands.py
+++ b/src/Mod/Arch/ArchCommands.py
@@ -617,7 +617,10 @@ def getTuples(data,scale=1,placement=None,normal=None):
             data = Part.Wire(DraftGeomUtils.sortEdges(data.Wires[0].Edges))
             verts = data.Vertexes
             try:
-                if DraftVecUtils.angle(verts[1].Point,verts[0].Point,normal) >= 0:
+                c = data.CenterOfMass
+                v1 = verts[0].Point.sub(c)
+                v2 = verts[1].Point.sub(c)
+                if DraftVecUtils.angle(v2,v1,normal) >= 0:
                     # inverting verts order if the direction is couterclockwise
                     verts.reverse()
             except:
@@ -666,9 +669,10 @@ def getBrepFacesData(obj,scale=1):
                         s = []
                         for face in obj.Shape.Faces:
                             f = []
+                            f.append(getTuples(face.OuterWire,scale,normal=face.normalAt(0,0)))
                             for wire in face.Wires:
-                                t = getTuples(wire,scale,normal=face.normalAt(0,0))
-                                f.append(t)
+                                if wire.hashCode() != face.OuterWire.hashCode():
+                                    f.append(getTuples(wire,scale,normal=DraftVecUtils.neg(face.normalAt(0,0))))
                             s.append(f)
                         sols.append(s)
                     return sols
diff --git a/src/Tools/offlinedoc/buildpdf.py b/src/Tools/offlinedoc/buildpdf.py
index e98cbe4278..23fcc577f0 100755
--- a/src/Tools/offlinedoc/buildpdf.py
+++ b/src/Tools/offlinedoc/buildpdf.py
@@ -36,7 +36,7 @@ from urllib2 import urlopen, HTTPError
 #    CONFIGURATION       #################################################
 
 INDEX = "Online_Help_Toc" # the start page from where to crawl the wiki
-PDFCONVERTOR = 'firefox' # can be 'pisa', 'htmldoc', 'wkhtmltopdf' or 'firefox'
+PDFCONVERTOR = 'wkhtmltopdf' # can be 'pisa', 'htmldoc', 'wkhtmltopdf' or 'firefox'
 VERBOSE = True # set true to get output messages
 INCLUDECOMMANDS = True # if true, the command pages of each workbench are included after each WB page
 OVERWRITE = True # if true, pdf files are recreated even if already existing