diff --git a/shard.yml b/shard.yml
index d2d2694..661b4be 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,6 +1,6 @@
 name: awscr-signer
-version: 0.5.4
-crystal: 0.28.0
+version: 0.6.0
+crystal: 0.30.0
 
 authors:
   - Taylor Finnell <tmfinnell@gmail.com>
diff --git a/src/awscr-signer/core/header.cr b/src/awscr-signer/core/header.cr
index 226ca64..dfced74 100644
--- a/src/awscr-signer/core/header.cr
+++ b/src/awscr-signer/core/header.cr
@@ -10,7 +10,8 @@ module Awscr
     # header.to_s # => k:v,value2
     # ```
     class Header
-      include Comparable(Header | String)
+      include Comparable(Header)
+      include Comparable(String)
 
       @values = [] of String
 
diff --git a/src/awscr-signer/core/header_collection.cr b/src/awscr-signer/core/header_collection.cr
index aded3db..b2880f6 100644
--- a/src/awscr-signer/core/header_collection.cr
+++ b/src/awscr-signer/core/header_collection.cr
@@ -11,7 +11,6 @@ module Awscr
     # ```
     class HeaderCollection
       include Enumerable(Header)
-      include Indexable(Header)
 
       # List of headers names not allowed in the collection.
       BLACKLIST_HEADERS = [
diff --git a/src/awscr-signer/v4/uri.cr b/src/awscr-signer/v4/uri.cr
index 701be7a..9b7450b 100644
--- a/src/awscr-signer/v4/uri.cr
+++ b/src/awscr-signer/v4/uri.cr
@@ -14,7 +14,7 @@ module Awscr
       @query = QueryString.new
 
       def self.encode(path : String)
-        URI.escape(path) { |byte| URI.unreserved?(byte) || byte.chr == '/' }
+        URI.encode(path)
       end
 
       # The path must be non encoded.
diff --git a/src/awscr-signer/version.cr b/src/awscr-signer/version.cr
index 95e0912..ba4af8f 100644
--- a/src/awscr-signer/version.cr
+++ b/src/awscr-signer/version.cr
@@ -1,7 +1,7 @@
 module Awscr
   MAJOR = "0"
-  MINOR = "5"
-  PATCH = "4"
+  MINOR = "6"
+  PATCH = "0"
 
   VERSION = [MAJOR, MINOR, PATCH].join(".")
 end