Minor changes to FilePreProcessor