Fix issues relating to using Forensic Path