diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ea933d..09997b0 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [2.0.0-rc5] - 2021-01-27
+### Changed
+- [2021-01-27] Minor code tweaks [@carbotaniuman].
+
 ## [2.0.0-rc4] - 2021-01-27
 ### Changed
 - [2021-01-27] Added `threads` back with new semantics [@carbotaniuman].
@@ -308,7 +312,8 @@ This release contains many breaking changes! Of note are the changes to the cach
 ### Fixed
 - [2020-06-11] Tweaked logging configuration to reduce log file sizes by [@carbotaniuman].
 
-[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc4...HEAD
+[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc5...HEAD
+[2.0.0-rc5]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc4...2.0.0-rc5
 [2.0.0-rc4]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc3...2.0.0-rc4
 [2.0.0-rc3]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc2...2.0.0-rc3
 [2.0.0-rc2]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc1...2.0.0-rc2
diff --git a/src/main/kotlin/mdnet/data/Token.kt b/src/main/kotlin/mdnet/data/Token.kt
index 72582d8..3ea1fc4 100644
--- a/src/main/kotlin/mdnet/data/Token.kt
+++ b/src/main/kotlin/mdnet/data/Token.kt
@@ -23,4 +23,4 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming
 import java.time.OffsetDateTime
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
-data class Token(val expires: OffsetDateTime, val ip: String, val hash: String, val clientId: String)
+data class Token(val expires: OffsetDateTime, val hash: String, val clientId: String? = null, val ip: String? = null)
diff --git a/src/main/kotlin/mdnet/server/ImageServer.kt b/src/main/kotlin/mdnet/server/ImageServer.kt
index db8b1ef..c00fed8 100644
--- a/src/main/kotlin/mdnet/server/ImageServer.kt
+++ b/src/main/kotlin/mdnet/server/ImageServer.kt
@@ -258,7 +258,6 @@ fun getServer(
 
     val client =
         ClientFilters.SetBaseUriFrom(remoteSettings.imageServer)
-            .then(ClientFilters.MicrometerMetrics.RequestCounter(registry))
             .then(ClientFilters.MicrometerMetrics.RequestTimer(registry))
             .then(apache)