diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5996bf6b..4df6d10d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ CHANGELOG for FlatCAM beta
 - Tool Isolation - made sure that the app can load from Tools Database only tools marked for Isolation tool
 - Tool Isolation - on Tool start it will attempt to load the Preferences set tools by diameter from Tools Database. If it can't find one there it will add a default tool.
 - in Tools: Transform, SUb, RulesCheck, DistanceMin, Distance - moved the Tool UI in its own class
+- some small fixes
 
 26.08.2020
 
diff --git a/appDatabase.py b/appDatabase.py
index a4130b45..0fb7dacb 100644
--- a/appDatabase.py
+++ b/appDatabase.py
@@ -3356,6 +3356,10 @@ class ToolsDB2(QtWidgets.QWidget):
             self.app.inform.emit('[WARNING_NOTCL] %s...' % _("No Tool/row selected in the Tools Database table"))
             return
 
+        if not self.db_tool_dict:
+            self.app.inform.emit('[ERROR_NOTCL] %s' % _("Tools DB empty."))
+            return
+
         for item in self.ui.tree_widget.selectedItems():
             tool_uid = item.data(0, QtCore.Qt.DisplayRole)
 
diff --git a/appTools/ToolDistance.py b/appTools/ToolDistance.py
index 24a7cd8d..56752bc5 100644
--- a/appTools/ToolDistance.py
+++ b/appTools/ToolDistance.py
@@ -547,6 +547,7 @@ class DistUI:
         self.app = app
         self.decimals = self.app.decimals
         self.layout = layout
+        self.units = self.app.defaults['units'].lower()
 
         # ## Title
         title_label = FCLabel("<font size=4><b>%s</b></font><br>" % self.toolName)
diff --git a/appTools/ToolDistanceMin.py b/appTools/ToolDistanceMin.py
index b21725e5..4d4cb4c7 100644
--- a/appTools/ToolDistanceMin.py
+++ b/appTools/ToolDistanceMin.py
@@ -224,8 +224,9 @@ class DistMinUI:
         self.app = app
         self.decimals = self.app.decimals
         self.layout = layout
+        self.units = self.app.defaults['units'].lower()
 
-# ## Title
+        # ## Title
         title_label = QtWidgets.QLabel("<font size=4><b>%s</b></font><br>" % self.toolName)
         self.layout.addWidget(title_label)
 
diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py
index 8a01fd19..b61904de 100644
--- a/appTools/ToolIsolation.py
+++ b/appTools/ToolIsolation.py
@@ -1057,11 +1057,6 @@ class ToolIsolation(AppTool, Gerber):
             self.on_tool_default_add()
             return
 
-        if not tools_db_dict:
-            self.app.inform.emit('[ERROR_NOTCL] %s' % _("Tools DB empty."))
-            self.blockSignals(False)
-            return
-
         tool_found = 0
 
         offset = 'Path'