diff --git a/src/Cmdlets/GetMinIOBucketCmdlet.cs b/src/Cmdlets/GetMinIOBucketCmdlet.cs
index 95e392b..8214276 100644
--- a/src/Cmdlets/GetMinIOBucketCmdlet.cs
+++ b/src/Cmdlets/GetMinIOBucketCmdlet.cs
@@ -64,7 +64,7 @@ namespace PSMinIO.Cmdlets
                 {
                     var wildcardPattern = new WildcardPattern(BucketName, WildcardOptions.IgnoreCase);
                     buckets = buckets.Where(b => b.Name != null && wildcardPattern.IsMatch(b.Name)).ToList();
-                    WriteVerboseMessage("Filtered to {0} buckets matching pattern '{1}'", buckets.Count, BucketName);
+                    WriteVerboseMessage("Filtered to {0} buckets matching pattern '{1}'", buckets.Count, BucketName!);
                 }
 
                 // Enhance bucket information if requested
diff --git a/src/Cmdlets/GetMinIOObjectCmdlet.cs b/src/Cmdlets/GetMinIOObjectCmdlet.cs
index 961e46f..e92f337 100644
--- a/src/Cmdlets/GetMinIOObjectCmdlet.cs
+++ b/src/Cmdlets/GetMinIOObjectCmdlet.cs
@@ -108,7 +108,7 @@ namespace PSMinIO.Cmdlets
                 {
                     var wildcardPattern = new WildcardPattern(Name, WildcardOptions.IgnoreCase);
                     objects = objects.Where(o => o.Name != null && wildcardPattern.IsMatch(o.Name)).ToList();
-                    WriteVerboseMessage("Filtered to {0} objects matching pattern '{1}'", objects.Count, Name);
+                    WriteVerboseMessage("Filtered to {0} objects matching pattern '{1}'", objects.Count, Name!);
                 }
 
                 // Apply directory filters
diff --git a/src/Utils/ZipArchiveBuilder.cs b/src/Utils/ZipArchiveBuilder.cs
index 2eb45e7..0132e1d 100644
--- a/src/Utils/ZipArchiveBuilder.cs
+++ b/src/Utils/ZipArchiveBuilder.cs
@@ -194,7 +194,7 @@ namespace PSMinIO.Utils
             var fullPath = fileInfo.FullName;
             if (fullPath.StartsWith(basePath, StringComparison.OrdinalIgnoreCase))
             {
-                var relativePath = fullPath.Substring(basePath.Length).TrimStart('\\', '/');
+                var relativePath = fullPath.Substring(basePath!.Length).TrimStart('\\', '/');
                 return relativePath.Replace('\\', '/'); // Use forward slashes for zip entries
             }