Minor mods to thorfile