Fix errors from refactor.
Force use of different signature files for each sample.