Tidying up of filesToFix #42