Changes to allow proper selection of keys for ssh connection