Fix way some files are handled in bootstrap script.