Fix up IP and Port