Fix subtle problem with scp protocol/port selection