Just some more preparatory stuff for the fault detectors