Fix issue with ssh port support