More fixes to the fingerprint types.
Fixed JSON report.