diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py
index 75f630ca8..5fa5dfbdd 100644
--- a/src/Mod/Fem/Init.py
+++ b/src/Mod/Fem/Init.py
@@ -26,6 +26,9 @@
 #***************************************************************************/
 
 
+import FreeCAD
+
+
 FreeCAD.addExportType("TetGen file (*.poly)", "convert2TetGen")
 FreeCAD.addImportType("FEM formats (*.unv *.med *.dat *.bdf)", "Fem")
 FreeCAD.addExportType("FEM formats (*.unv *.med *.dat *.inp)", "Fem")
diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
index a00c72fb9..05b9300a8 100644
--- a/src/Mod/Fem/InitGui.py
+++ b/src/Mod/Fem/InitGui.py
@@ -30,6 +30,10 @@
 #***************************************************************************/
 
 
+import FreeCAD
+import FreeCADGui
+
+
 class FemWorkbench (Workbench):
     "Fem workbench object"
     def __init__(self):
@@ -87,8 +91,7 @@ class FemWorkbench (Workbench):
         else:
             FreeCAD.Console.PrintError("Setting working directory \'{}\' for ccx failed!\n")
 
-
     def GetClassName(self):
         return "FemGui::Workbench"
 
-Gui.addWorkbench(FemWorkbench())
+FreeCADGui.addWorkbench(FemWorkbench())
diff --git a/src/Mod/Fem/_CommandSolverJobControl.py b/src/Mod/Fem/_CommandSolverJobControl.py
index 60f207740..585d9df6c 100644
--- a/src/Mod/Fem/_CommandSolverJobControl.py
+++ b/src/Mod/Fem/_CommandSolverJobControl.py
@@ -44,7 +44,7 @@ class _CommandSolverJobControl(FemCommands):
 
     def Activated(self):
         solver_obj = FreeCADGui.Selection.getSelection()[0]
-        FreeCADGui.ActiveDocument.setEdit(solver_obj,0)
+        FreeCADGui.ActiveDocument.setEdit(solver_obj, 0)
 
 
 if FreeCAD.GuiUp:
diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
index d3693f9b8..35381e4c2 100644
--- a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
+++ b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
@@ -26,7 +26,6 @@ __url__ = "http://www.freecadweb.org"
 
 from FemTools import FemTools
 import FreeCAD
-import ccxFrdReader
 import os
 import time