Minor fixes - flexible port connexion