First set of improvements for fingerprint support