diff --git a/src/TokenGenerator.php b/src/TokenGenerator.php
index e34112c..e6fc26f 100644
--- a/src/TokenGenerator.php
+++ b/src/TokenGenerator.php
@@ -210,6 +210,6 @@ private function makeJwkThumbprint($dpop): string
 	private function getJwks() {
 		$key = $this->config->getKeys()->getPublicKey();
 		$jwks = new Jwks($key);
-		return json_decode($jwks->__toString(), true);
+		return json_decode((string) $jwks, true);
 	}
 }
diff --git a/src/Utils/Bearer.php b/src/Utils/Bearer.php
index 2be222d..09cded0 100644
--- a/src/Utils/Bearer.php
+++ b/src/Utils/Bearer.php
@@ -22,6 +22,9 @@
 /**
  * This class contains code to fetch the WebId from a request
  * that is make in legacy mode (bearer token with pop)
+ *
+ * @ TODO: Make sure this code complies with the spec and validate the tokens properly;
+ * https://datatracker.ietf.org/doc/html/rfc7800
  */
 class Bearer {