diff --git a/build.gradle b/build.gradle
index 65a28a8..34cd8a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,6 @@ pmd {
 
 detekt {
     toolVersion = "main-SNAPSHOT"
-    ignoreFailures = true // Baseline is incomplete and fails on various CIs, not sure why.
     baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
 
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 91a5e9c..263aa71 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -15,6 +15,42 @@
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
+    <ID>MagicNumber:AddLog.kt$AddLog$4</ID>
+    <ID>MagicNumber:Comment.kt$Comment$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
+    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Dice.kt$Dice$7</ID>
+    <ID>MagicNumber:FeedReader.kt$FeedReader$5</ID>
+    <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$10</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$1000L</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$3</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$5</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
+    <ID>MagicNumber:Modules.kt$Modules$7</ID>
+    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:Tell.kt$Tell$50</ID>
+    <ID>MagicNumber:Tell.kt$Tell$7</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
+    <ID>MagicNumber:Users.kt$Users$8</ID>
+    <ID>MagicNumber:Utils.kt$Utils$30</ID>
+    <ID>MagicNumber:Utils.kt$Utils$365</ID>
+    <ID>MagicNumber:Utils.kt$Utils$7</ID>
+    <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime$17</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
     <ID>MemberNameEqualsClassName:Calc.kt$Calc.Companion$ @JvmStatic fun calc(query: String): String</ID>
     <ID>MemberNameEqualsClassName:Lookup.kt$Lookup.Companion$ @JvmStatic @Throws(UnknownHostException::class) fun lookup(query: String): String</ID>
     <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
@@ -48,5 +84,13 @@
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
+    <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
+    <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
+    <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
+    <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
+    <ID>TooManyFunctions:Utils.kt$Utils$Utils</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/version.properties b/version.properties
index 4842225..e99ce5a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Apr 29 19:35:53 PDT 2021
-version.buildmeta=528
+#Fri Apr 30 21:34:46 PDT 2021
+version.buildmeta=538
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+528
+version.semver=0.8.0-beta+538