Fixed more bugs with IP Address determination