Inline fix and rework fingerprint parse