Bugfixes for fingerprinting.