diff --git a/Src/Fido2.Models/AssertionOptions.cs b/Src/Fido2.Models/AssertionOptions.cs
index cb6e5c5e..03a22b06 100644
--- a/Src/Fido2.Models/AssertionOptions.cs
+++ b/Src/Fido2.Models/AssertionOptions.cs
@@ -24,7 +24,7 @@ public class AssertionOptions : Fido2ResponseBase
     /// This member specifies a time, in milliseconds, that the caller is willing to wait for the call to complete. This is treated as a hint, and MAY be overridden by the client.
     /// </summary>
     [JsonPropertyName("timeout")]
-    public uint Timeout { get; set; }
+    public ulong Timeout { get; set; }
 
     /// <summary>
     /// This OPTIONAL member specifies the relying party identifier claimed by the caller.If omitted, its value will be the CredentialsContainer object’s relevant settings object's origin's effective domain
diff --git a/Src/Fido2.Models/CredentialCreateOptions.cs b/Src/Fido2.Models/CredentialCreateOptions.cs
index 1625486c..f899a88f 100644
--- a/Src/Fido2.Models/CredentialCreateOptions.cs
+++ b/Src/Fido2.Models/CredentialCreateOptions.cs
@@ -43,14 +43,14 @@ public sealed class CredentialCreateOptions : Fido2ResponseBase
     /// This member specifies a time, in milliseconds, that the caller is willing to wait for the call to complete. This is treated as a hint, and MAY be overridden by the platform.
     /// </summary>
     [JsonPropertyName("timeout")]
-    public long Timeout { get; set; }
+    public ulong Timeout { get; set; }
 
     /// <summary>
     /// This member is intended for use by Relying Parties that wish to express their preference for attestation conveyance.The default is none.
     /// </summary>
     [JsonPropertyName("attestation")]
-    public AttestationConveyancePreference Attestation { get; set; } = AttestationConveyancePreference.None;
-
+    public AttestationConveyancePreference Attestation { get; set; } = AttestationConveyancePreference.None;
+
     /// <summary>
     /// This member is intended for use by Relying Parties that wish to select the appropriate authenticators to participate in the create() operation.
     /// </summary>
@@ -225,7 +225,7 @@ public ResidentKeyRequirement ResidentKey
     /// </summary>
     [Obsolete("Use property ResidentKey.")]
     [JsonPropertyName("requireResidentKey")]
-    public bool RequireResidentKey
+    public bool RequireResidentKey
     {
         get => _requireResidentKey;
         set