diff --git a/README.md b/README.md
index 3e69c99..6211933 100644
--- a/README.md
+++ b/README.md
@@ -421,13 +421,13 @@ npm run release
 ```
 
 <!-- Badges -->
-[npm-version-src]: https://img.shields.io/npm/v/%40itpropro/nuxt-oidc-auth?labelColor=18181B&color=28CF8D
+[npm-version-src]: https://img.shields.io/npm/v/nuxt-oidc-auth?labelColor=18181B&color=28CF8D
 [npm-version-href]: https://npmjs.com/package/nuxt-oidc-auth
 
-[npm-downloads-src]: https://img.shields.io/npm/dm/%40itpropro/nuxt-oidc-auth?labelColor=18181B&color=28CF8D
+[npm-downloads-src]: https://img.shields.io/npm/dm/nuxt-oidc-auth?labelColor=18181B&color=28CF8D
 [npm-downloads-href]: https://npmjs.com/package/nuxt-oidc-auth
 
-[license-src]: https://img.shields.io/npm/l/%40itpropro%2Fnuxt-oidc-auth?labelColor=18181B&color=28CF8D
+[license-src]: https://img.shields.io/npm/l/nuxt-oidc-auth?labelColor=18181B&color=28CF8D
 [license-href]: https://npmjs.com/package/nuxt-oidc-auth
 
 [nuxt-src]: https://img.shields.io/badge/Nuxt-18181B?logo=nuxt.js
diff --git a/src/runtime/server/utils/security.ts b/src/runtime/server/utils/security.ts
index 74d877a..1fe9594 100644
--- a/src/runtime/server/utils/security.ts
+++ b/src/runtime/server/utils/security.ts
@@ -128,6 +128,7 @@ export function generateRandomUrlSafeString(length: number = 48): string {
  * @returns The base64 encoded encrypted refresh token and the base64 encoded initialization vector.
  */
 export async function encryptToken(token: string, key: string): Promise<EncryptedToken> {
+  // TODO: Replace Buffer
   const secretKey = await subtle.importKey('raw', Buffer.from(key, 'base64'), {
     name: 'AES-GCM',
     length: 256
@@ -148,6 +149,7 @@ export async function encryptToken(token: string, key: string): Promise<Encrypte
  */
 export async function decryptToken(input: EncryptedToken, key: string): Promise<string> {
   const { encryptedToken, iv } = input
+  // TODO: Replace Buffer
   const secretKey = await subtle.importKey('raw', Buffer.from(key, 'base64'), {
     name: 'AES-GCM',
     length: 256