SSH script small fixes

Change-Id: I22cc199e48b56091e2d8d619e70ceea71c05d7e8