diff --git a/tclCommands/TclCommandCncjob.py b/tclCommands/TclCommandCncjob.py
index 74778c26..1804fe77 100644
--- a/tclCommands/TclCommandCncjob.py
+++ b/tclCommands/TclCommandCncjob.py
@@ -75,7 +75,7 @@ class TclCommandCncjob(TclCommandSignaled):
             ('pp', 'Name of the Geometry postprocessor. No quotes, case sensitive'),
             ('muted', 'It will not put errors in the Shell.')
         ]),
-        'examples': ['cncjob geo_name -tooldia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -ppname_g default']
+        'examples': ['cncjob geo_name -dia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -pp default']
     }
 
     def execute(self, args, unnamed_args):
diff --git a/tclCommands/TclCommandCopperClear.py b/tclCommands/TclCommandCopperClear.py
index 0f93169e..85689b1e 100644
--- a/tclCommands/TclCommandCopperClear.py
+++ b/tclCommands/TclCommandCopperClear.py
@@ -249,7 +249,7 @@ class TclCommandCopperClear(TclCommand):
                 self.app.ncclear_tool.clear_copper(ncc_obj=obj,
                                                    sel_obj=box_obj,
                                                    select_method='box',
-                                                   tooldia=tooldia,
+                                                   ncctooldia=tooldia,
                                                    overlap=overlap,
                                                    order=order,
                                                    margin=margin,
diff --git a/tclCommands/TclCommandCutout.py b/tclCommands/TclCommandCutout.py
index 782d174b..ca0203e7 100644
--- a/tclCommands/TclCommandCutout.py
+++ b/tclCommands/TclCommandCutout.py
@@ -74,7 +74,7 @@ class TclCommandCutout(TclCommand):
         if 'gaps' in args:
             gaps_par = args['gaps']
         else:
-            gaps_par = 4
+            gaps_par = "4"
 
         if 'gapsize' in args:
             gapsize_par = args['gapsize']
diff --git a/tclCommands/TclCommandMillDrills.py b/tclCommands/TclCommandMillDrills.py
index 77084313..91d4a9f8 100644
--- a/tclCommands/TclCommandMillDrills.py
+++ b/tclCommands/TclCommandMillDrills.py
@@ -7,6 +7,7 @@
 
 from ObjectCollection import *
 from tclCommands.TclCommand import TclCommandSignaled
+import math
 
 
 class TclCommandMillDrills(TclCommandSignaled):
diff --git a/tclCommands/TclCommandOpenGerber.py b/tclCommands/TclCommandOpenGerber.py
index 3ffbb221..d48f5a87 100644
--- a/tclCommands/TclCommandOpenGerber.py
+++ b/tclCommands/TclCommandOpenGerber.py
@@ -46,7 +46,7 @@ class TclCommandOpenGerber(TclCommandSignaled):
         # How the object should be initialized
         def obj_init(gerber_obj, app_obj):
 
-            if not isinstance(gerber_obj, Geometry):
+            if not isinstance(gerber_obj, FlatCAMGerber):
                 self.raise_tcl_error('Expected FlatCAMGerber, got %s %s.' % (outname, type(gerber_obj)))
 
             # Opening the file happens here