Tweaks to improve fingerprinting