diff --git a/src/Shodan.Net/Models/Banner.cs b/src/Shodan.Net/Models/Banner.cs
index 2d65106..ee1e8eb 100644
--- a/src/Shodan.Net/Models/Banner.cs
+++ b/src/Shodan.Net/Models/Banner.cs
@@ -70,12 +70,12 @@ namespace Shodan.Net.Models
         /// The IP address of the host as an integer
         /// </summary>
         [DataMember(Name = "ip")]
-        public int? Ip { get; set; }
+        public long? Ip { get; set; }
 
         /// <summary>
         /// The IPv6 address of the host as a string. If this is present then the "ip" and "ip_str" fields wont be.
         /// </summary>
-        [DataMember(Name = "ip")]
+        [DataMember(Name = "ipv6")]
         public string Ipv6 { get; set; }
 
         /// <summary>
diff --git a/src/Shodan.Net/Models/Location.cs b/src/Shodan.Net/Models/Location.cs
index 506db69..afa6627 100644
--- a/src/Shodan.Net/Models/Location.cs
+++ b/src/Shodan.Net/Models/Location.cs
@@ -64,7 +64,7 @@ namespace Shodan.Net.Models
         /// The area code for the device's location. Only available for the US.
         /// </summary>
         [DataMember(Name = "area_code")]
-        public int AreaCode { get; set; }
+        public int? AreaCode { get; set; }
 
         /// <summary>
         ///  The designated market area code for the area where the device is located. Only available for the US.
diff --git a/src/Shodan.Net/Models/SearchHostResults.cs b/src/Shodan.Net/Models/SearchHostResults.cs
index a035d92..cd32a99 100644
--- a/src/Shodan.Net/Models/SearchHostResults.cs
+++ b/src/Shodan.Net/Models/SearchHostResults.cs
@@ -12,6 +12,7 @@ namespace Shodan.Net.Models
     [DataContract]
     public class SearchHostResults
     {
+        [DataMember(Name = "matches")]
         public List<Banner> Matches { get; set; }
 
         [DataMember(Name = "facets")]