Improve ssh public key handling