Fixes for ssh forwarding