diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index ec2975d2..8bbb38db 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -131,11 +131,13 @@ class App(QtCore.QObject):
             json.dump([], f)
             f.close()
 
-        # Application directory. Chdir to it.
-        self.app_home = os.path.dirname(os.path.realpath(__file__))
-        App.log.debug("Application path is " + self.app_home)
-        App.log.debug("Started in " + os.getcwd())
-        os.chdir(self.app_home)
+        # Application directory. Chdir to it. Otherwise, trying to load
+        # GUI icons will fail as thir path is relative.
+        # This will fail under cx_freeze ...
+        # self.app_home = os.path.dirname(os.path.realpath(__file__))
+        # App.log.debug("Application path is " + self.app_home)
+        # App.log.debug("Started in " + os.getcwd())
+        # os.chdir(self.app_home)
 
         ####################
         ## Initialize GUI ##
diff --git a/camlib.py b/camlib.py
index 21d7b195..0ff05e3e 100644
--- a/camlib.py
+++ b/camlib.py
@@ -38,7 +38,7 @@ from descartes.patch import PolygonPatch
 
 import simplejson as json
 # TODO: Commented for FlatCAM packaging with cx_freeze
-from matplotlib.pyplot import plot, subplot
+#from matplotlib.pyplot import plot, subplot
 
 import logging