BZ977 Fix for endpoint/port initialisation