Fix bugs related to `additionalFiles` option