Minor fixes
Change the approach for storing IP addresses.