Changes to fix first network IP address issue