Fingerprint and PublicPort fixes