Custom fingerprint fixes