Fix a few leftover fragments of host/port settings