Fixes for fingerprints