Better handling of RSA keys