diff --git a/Samples/Platform SDK/ArchiverRoleSample/ArchiverRoleSample.cs b/Samples/Platform SDK/ArchiverRoleSample/ArchiverRoleSample.cs
index 2ade67dc..94edb5e5 100644
--- a/Samples/Platform SDK/ArchiverRoleSample/ArchiverRoleSample.cs	
+++ b/Samples/Platform SDK/ArchiverRoleSample/ArchiverRoleSample.cs	
@@ -194,7 +194,7 @@ void DisplayCertificates(IReadOnlyCollection<X509Certificate2> certificates)
                                    Valid From: {cert.NotBefore}
                                    Valid Until: {cert.NotAfter}
                                    Has Private Key: {cert.HasPrivateKey}
-                                   Public Key Algorithm: {cert.PublicKey.Key.KeyExchangeAlgorithm}
+                                   Public Key Algorithm: {cert.PublicKey.Oid.FriendlyName}
                                    Signature Algorithm: {cert.SignatureAlgorithm.FriendlyName}
                                    Version: {cert.Version}
                                    Friendly Name: {cert.FriendlyName}
diff --git a/Samples/Platform SDK/CredentialBuilderSample/CredentialBuilderSample.cs b/Samples/Platform SDK/CredentialBuilderSample/CredentialBuilderSample.cs
index 10620fd8..47341f45 100644
--- a/Samples/Platform SDK/CredentialBuilderSample/CredentialBuilderSample.cs	
+++ b/Samples/Platform SDK/CredentialBuilderSample/CredentialBuilderSample.cs	
@@ -32,7 +32,7 @@ protected override async Task RunAsync(Engine engine, CancellationToken token)
         await BuildAndDisplayCredential(engine, credentialBuilder, "48-Bit Corporate 1000 Wiegand Credential", new Wiegand48BitCorporate1000CredentialFormat(companyId: 1, cardId: 2));
         await BuildAndDisplayCredential(engine, credentialBuilder, "Corporate 1000 Wiegand Credential", new WiegandCorporate1000CredentialFormat(companyId: 1, cardId: 2));
         await BuildAndDisplayCredential(engine, credentialBuilder, "License Plate Credential", new LicensePlateCredentialFormat(licensePlate: "12345"));
-        await BuildAndDisplayCredential(engine, credentialBuilder, "Keypad Credential", new KeypadCredentialFormat(credentialCode: 12345));
+        await BuildAndDisplayCredential(engine, credentialBuilder, "Keypad Credential", new KeypadCredentialFormat(credentialCode: "12345"));
         await BuildAndDisplayCredential(engine, credentialBuilder, "Raw Card Credential", new RawCardCredentialFormat(rawData: "1234", bitLength: 32));
 
         var fascN75Dict = new Dictionary<string, string>
diff --git a/Samples/Platform SDK/EntityCacheSample/EntityCacheSample.cs b/Samples/Platform SDK/EntityCacheSample/EntityCacheSample.cs
index 87fc386e..9d94ba52 100644
--- a/Samples/Platform SDK/EntityCacheSample/EntityCacheSample.cs	
+++ b/Samples/Platform SDK/EntityCacheSample/EntityCacheSample.cs	
@@ -78,7 +78,9 @@ private void PrintEntityCache(Engine engine)
 
         int totalEntities = 0;
 
+#pragma warning disable CS0612 // EntityType.ReportTemplate is obsolete; we filter it explicitly so it is not iterated
         foreach (var entityType in Enum.GetValues(typeof(EntityType)).OfType<EntityType>().Except(new[] { EntityType.None, EntityType.ReportTemplate }).OrderBy(type => type.ToString()))
+#pragma warning restore CS0612
         {
             int count = engine.GetEntities(entityType).Count;
             totalEntities += count;
diff --git a/Samples/Platform SDK/RoleSample/RoleSample.cs b/Samples/Platform SDK/RoleSample/RoleSample.cs
index ac27567f..b6452f50 100644
--- a/Samples/Platform SDK/RoleSample/RoleSample.cs	
+++ b/Samples/Platform SDK/RoleSample/RoleSample.cs	
@@ -300,7 +300,7 @@ private void DisplayCertificates(IReadOnlyCollection<X509Certificate2> certifica
             Console.WriteLine($"    Valid From: {cert.NotBefore:f}");
             Console.WriteLine($"    Valid Until: {cert.NotAfter:f}");
             Console.WriteLine($"    Has Private Key: {cert.HasPrivateKey}");
-            Console.WriteLine($"    Public Key Algorithm: {cert.PublicKey.Key.KeyExchangeAlgorithm}");
+            Console.WriteLine($"    Public Key Algorithm: {cert.PublicKey.Oid.FriendlyName}");
             Console.WriteLine($"    Signature Algorithm: {cert.SignatureAlgorithm.FriendlyName}");
             Console.WriteLine($"    Version: {cert.Version}");
             Console.WriteLine($"    Friendly Name: {cert.FriendlyName}");