#1280 Some fixes to PublicIpAddress