keyring, server & rsa key store fixes