diff --git a/spotbugs/etc/findbugs.xml b/spotbugs/etc/findbugs.xml
index 88c2a02f65d..78f98baec7c 100644
--- a/spotbugs/etc/findbugs.xml
+++ b/spotbugs/etc/findbugs.xml
@@ -682,7 +682,7 @@
           <Detector class="edu.umd.cs.findbugs.detect.DontReusePublicIdentifiers" speed="fast"
                     reports="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES,PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_FIELD_NAMES,PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_METHOD_NAMES,PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_LOCAL_VARIABLE_NAMES"
                     disabled="true"/>
-          <Detector class="edu.umd.cs.findbugs.detect.UnnecessaryEnvUsage"
+          <Detector class="edu.umd.cs.findbugs.detect.UnnecessaryEnvUsage" speed="fast"
                     reports="ENV_USE_PROPERTY_INSTEAD_OF_ENV"/>
           <!-- Bug Categories -->
           <BugCategory category="NOISE" hidden="true"/>
diff --git a/spotbugs/etc/messages.xml b/spotbugs/etc/messages.xml
index c150da9eab7..4e0b17db5b8 100644
--- a/spotbugs/etc/messages.xml
+++ b/spotbugs/etc/messages.xml
@@ -9143,15 +9143,15 @@ Using floating-point variables should not be used as loop counters, as they are
     <LongDescription>It is safer to use validated Java property '{3}' instead of insecure environment variable '{2}' in class {4} (method {1}).</LongDescription>
     <Details>
       <![CDATA[<p>
-        Environment variables may be accidently or maliciously altered suring process execution. This makes them unsafe to be relied
+        Environment variables may be accidentally or maliciously altered during process execution. This makes them unsafe to be relied
         upon important system-level information. Some environment variables are understood, validated and secured by the JVM.
         These values are available as system properties, which should be used instead.
       </p>
       <p>
-        Any standard value which can also be accessed through System.getProperty() should be accessed so instead of using System.getenv().
+        Any value which can be accessed through both System.getProperty() and System.getenv(), should be accessed using the latter.
       </p>
       <p>
-        Mapping of identical or similar Java properties:
+        Mapping of corresponding Java properties:
         <table>
           <tr>
              <th>Environment variable</th> <th>Property</th>