More fixes for preparing files
18 files changed