Fix key id and fingerprint handling, use full key ids