Fingerprinting improvements