Fixes for ssh-deploy