Another fix to public key & private key interface.