diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 so please do not open issues:
 
 - Some JOSE tools and libraries permit the use of **short keys**, in
-  violation of the RFCs.  This implementation reject JWS or JWT
+  violation of the RFCs.  This implementation rejects JWS or JWT
   objects minted with short keys, as required by the RFCs.
 
 - The *Auth0* software produces objects with an [invalid `"x5t"`
@@ -88,4 +88,4 @@
 request.  Write a [well formed commit message](
 http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 If your patch is nontrivial, update the copyright notice at the top
-of the modified files
+of the modified files.
diff --git a/jose.cabal b/jose.cabal
--- a/jose.cabal
+++ b/jose.cabal
@@ -1,5 +1,5 @@
 name:                jose
-version:             0.8.2.0
+version:             0.8.2.1
 synopsis:
   Javascript Object Signing and Encryption and JSON Web Token library
 description:
@@ -63,7 +63,7 @@
   build-depends:
     base >= 4.8 && < 5
     , attoparsec
-    , base64-bytestring == 1.0.*
+    , base64-bytestring >= 1.0 && < 1.2
     , concise >= 0.1
     , containers >= 0.5
     , cryptonite >= 0.7
diff --git a/src/Crypto/JWT.hs b/src/Crypto/JWT.hs
--- a/src/Crypto/JWT.hs
+++ b/src/Crypto/JWT.hs
@@ -35,9 +35,9 @@
 mkClaims = do
   t <- 'currentTime'
   pure $ 'emptyClaimsSet'
-    & 'claimIss' .~ Just ("alice")
-    & 'claimAud' .~ Just ('Audience' ["bob"])
-    & 'claimIat' .~ Just ('NumericDate' t)
+    & 'claimIss' ?~ "alice"
+    & 'claimAud' ?~ 'Audience' ["bob"]
+    & 'claimIat' ?~ 'NumericDate' t
 
 doJwtSign :: 'JWK' -> 'ClaimsSet' -> IO (Either 'JWTError' 'SignedJWT')
 doJwtSign jwk claims = runExceptT $ do