diff --git a/s3/handlers/handlers.go b/s3/handlers/handlers.go
index bd82b4349..c01e6bd58 100644
--- a/s3/handlers/handlers.go
+++ b/s3/handlers/handlers.go
@@ -1,4 +1,4 @@
-// Package handlers is an implementation of s3.Handlerser
+// Package handlers is an implementation of Handlerser
 package handlers
 
 import (
diff --git a/s3/handlers/options.go b/s3/handlers/options.go
index 091930878..09b69fa1a 100644
--- a/s3/handlers/options.go
+++ b/s3/handlers/options.go
@@ -39,13 +39,13 @@ var defaultCorsHeaders = []string{
 	consts.XRequestWith,
 	consts.Range,
 	consts.UserAgent,
-	"Amz-Sdk-Request",
-	"Amz-Sdk-Invocation-Id",
+	consts.Cid,
+	consts.CidList,
+	"Amz-*",
+	"amz-*",
 	"X-Amz*",
 	"x-amz*",
 	"*",
-	consts.Cid,
-	consts.CidList,
 }
 
 var defaultHeaders = map[string][]string{
diff --git a/s3/s3.go b/s3/s3.go
index 722bd3260..c7ff7bc07 100644
--- a/s3/s3.go
+++ b/s3/s3.go
@@ -40,7 +40,7 @@ func GetProviders() *providers.Providers {
 }
 
 func NewServer(cfg config.S3CompatibleAPI) *server.Server {
-	// lock global multiple keys read write lock
+	// global multiple keys read write lock
 	lock := ctxmu.NewDefaultMultiCtxRWMutex()
 
 	// services