Add some more watches to the finisher process.
Bug fixes to the MakeInFiles script.