diff --git a/tangostationcontrol/tangostationcontrol/common/measures.py b/tangostationcontrol/tangostationcontrol/common/measures.py
index 58b3c90f456ef3060d1431a7809395e1e63be237..596e0ff4e9c229a6ea848e0ac40c2a3edddc27e4 100644
--- a/tangostationcontrol/tangostationcontrol/common/measures.py
+++ b/tangostationcontrol/tangostationcontrol/common/measures.py
@@ -37,6 +37,7 @@ import tarfile
 import datetime
 import os
 import sys
+import shutil
 
 # Where to store the measures table sets
 IERS_ROOTDIR = "/opt/IERS"
@@ -135,7 +136,7 @@ def download_measures() -> str:
             shutil.rmtree(iers_dir_final)
         except Exception as e:
             # move out of the way instead then
-            iers_dir_final.rename(iers_final.with_suffix("delete-me"))
+            iers_dir_final.rename(iers_dir_final.with_suffix("delete-me"))
 
     # update our name to reflect the correct timestamp
     iers_dir_download.rename(iers_dir_final)
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_control.py b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
index 6206f4307bd65a50111bfbcbe1e07bbe0cfc271f..0d116c34fdf7f697fa89525991c67d2e0658d72b 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation_control.py
+++ b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
@@ -145,7 +145,7 @@ class ObservationControl(Device):
     @log_exceptions()
     @DebugIt()
     def Fault(self):
-        stop_all_observations()
+        self.stop_all_observations()
         self.set_state(DevState.FAULT)
 
     @only_when_on()
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index ada63e0fc0896a474c02ea7df19475f180d4c868..8fd978fbe054e1188a25a47c774489349c44ff68 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -78,5 +78,5 @@ commands =
 [flake8]
 filename = *.py,.stestr.conf,.txt
 #ignore = E501,  W291, W293, W391, E201, E201, E202, E203, E221, E222, E225, E226, E231, E241, E251, E252, E261, E301, E302, E303, E305, E306, E401, E402, F403,
-select = W292,B601,B602,T100,M001,F401,B001,B002,B003,B004,B005,B006,B007,B008,B009,B010,B011,B012,B013,B014.B015,B016,B017,B018, F401, F402, F403
+select = W292,B601,B602,T100,M001,F401,B001,B002,B003,B004,B005,B006,B007,B008,B009,B010,B011,B012,B013,B014.B015,B016,B017,B018, F401, F402, F403, F404, F405, F811, F812, F821
 exclude=.tox,.egg-info,libhdbpp-python