diff --git a/src/Control/Controller.php b/src/Control/Controller.php
index 017d69af0..a4b4fbc1d 100644
--- a/src/Control/Controller.php
+++ b/src/Control/Controller.php
@@ -533,8 +533,7 @@ class Controller extends RequestHandler implements TemplateGlobalProvider
      * called before Controller::init(). That is, you must call it in your controller's init method
      * before it calls parent::init().
      *
-     * @deprecated 4.1.0:5.0.0 Add this controller's url to
-     * SilverStripe\Security\BasicAuthMiddleware.URLPatterns injected property instead of setting false
+     * @deprecated 4.1.0:5.0.0 Add this controller's url to SilverStripe\Security\BasicAuthMiddleware.URLPatterns injected property instead
      */
     public function disableBasicAuth()
     {
diff --git a/src/Control/Email/SwiftPlugin.php b/src/Control/Email/SwiftPlugin.php
index ea9e0aa81..277c4f18b 100644
--- a/src/Control/Email/SwiftPlugin.php
+++ b/src/Control/Email/SwiftPlugin.php
@@ -2,11 +2,18 @@
 
 namespace SilverStripe\Control\Email;
 
+use SilverStripe\Dev\Deprecation;
+
 /**
  * @deprecated 4.12.0 Will be replaced with symfony/mailer
  */
 class SwiftPlugin implements \Swift_Events_SendListener
 {
+    public function __construct()
+    {
+        Deprecation::notice('4.12.0', 'Will be replaced with symfony/mailer', Deprecation::SCOPE_CLASS);
+    }
+
     /**
      * Before sending a message make sure all our overrides are taken into account
      *
diff --git a/src/Dev/FunctionalTest.php b/src/Dev/FunctionalTest.php
index 9d8dd2adb..c0329c355 100644
--- a/src/Dev/FunctionalTest.php
+++ b/src/Dev/FunctionalTest.php
@@ -66,7 +66,7 @@ if (class_exists(IsEqualCanonicalizing::class)) {
         /**
          * Set this to true on your sub-class to use the draft site by default for every test in this class.
          *
-         * @deprecated 4.2.0 Use ?stage=Stage in your ->get() querystring requests instead
+         * @deprecated 4.2.0 Use ?stage=Stage in your request's querystring instead
          * @var bool
          */
         protected static $use_draft_site = false;
diff --git a/src/ORM/FieldType/DBClassName.php b/src/ORM/FieldType/DBClassName.php
index 00c4287d0..1c7e68fef 100644
--- a/src/ORM/FieldType/DBClassName.php
+++ b/src/ORM/FieldType/DBClassName.php
@@ -38,7 +38,7 @@ class DBClassName extends DBEnum
      */
     public static function clear_classname_cache()
     {
-        Deprecation::notice('4.3', 'Call DBEnum::flushCache() instead');
+        Deprecation::notice('4.3', 'Use DBEnum::flushCache() instead');
         DBEnum::flushCache();
     }
 
diff --git a/src/Security/Group.php b/src/Security/Group.php
index b5d0b6e70..eb279e111 100755
--- a/src/Security/Group.php
+++ b/src/Security/Group.php
@@ -720,8 +720,6 @@ class Group extends DataObject
     /**
      * Code needs to be unique as it is used to identify a specific group. Ensure no duplicate
      * codes are created.
-     *
-     * @todo Replace with a validation error when a duplicate is found.
      */
     private function dedupeCode(): void
     {