diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
index b850de9bc6..f3744f1f31 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
@@ -217,7 +217,6 @@ public class URISupport {
       return uri;
    }
 
-   @SuppressWarnings("unchecked")
    private static Map<String, String> emptyMap() {
       return Collections.EMPTY_MAP;
    }
diff --git a/artemis-distribution/src/main/resources/README.html b/artemis-distribution/src/main/resources/README.html
index b708568237..d9fb198265 100644
--- a/artemis-distribution/src/main/resources/README.html
+++ b/artemis-distribution/src/main/resources/README.html
@@ -97,7 +97,7 @@ e.g.<br><br>
 
 $ ./artemis run --config xml:/home/artemis/bootstrap.xml<br><br>
 
-It is possible to configure run time paramters in the artemis.conf (artemis.conf.bat for windows) file under the "bin" directory of the broker directory.
+It is possible to configure run time parameters in the artemis.conf (artemis.conf.bat for windows) file under the "bin" directory of the broker directory.
 
 <h2>Stopping the Broker</h2>
 
diff --git a/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java b/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
index b8134b9a18..92a6733c6c 100644
--- a/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
+++ b/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
@@ -48,6 +48,7 @@ public final class LibaioFile<Callback extends SubmitInfo> implements AutoClosea
       return LibaioContext.lock(fd);
    }
 
+   @Override
    public void close() throws IOException {
       open = false;
       LibaioContext.close(fd);
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
index 9560ac1c0e..a437e68f16 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
@@ -108,7 +108,6 @@ public abstract class InboundTransformer {
       this.vendor = vendor;
    }
 
-   @SuppressWarnings("unchecked")
    protected void populateMessage(Message jms, org.apache.qpid.proton.message.Message amqp) throws Exception {
       Header header = amqp.getHeader();
       if (header == null) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 2a8bacffac..058b93801e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2367,6 +2367,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
          this.server = server;
       }
 
+      @Override
       public void run() {
          try {
             URL url = server.getConfiguration().getConfigurationUrl();
diff --git a/examples/features/ha/application-layer-failover/readme.html b/examples/features/ha/application-layer-failover/readme.html
index b60a66d5e8..c5248aade5 100644
--- a/examples/features/ha/application-layer-failover/readme.html
+++ b/examples/features/ha/application-layer-failover/readme.html
@@ -36,7 +36,7 @@ under the License.
          This listener will then be called by ActiveMQ Artemis in the event that connection failure is detected.</p>
      <p>User code in the ExceptionListener can then recreate any JMS Connection, Session, etc on another node and the application
      can continue.</p>
-     <p>Application-Layer failover is an alternative approach to High Availabilty (HA).</p>
+     <p>Application-Layer failover is an alternative approach to High Availability (HA).</p>
      <p>Application-Layer failover differs from automatic failover in that some client side coding is required in order
      to implement this. Also, with Application-Layer failover, since the old Session object dies and a new is created, any uncommitted
      work in the old Session will be lost, and any unacknowledged messages might be redelivered.</p>
diff --git a/examples/features/standard/jms-bridge/readme.html b/examples/features/standard/jms-bridge/readme.html
index 1ee0ff6b00..182f7fa625 100644
--- a/examples/features/standard/jms-bridge/readme.html
+++ b/examples/features/standard/jms-bridge/readme.html
@@ -48,7 +48,7 @@ under the License.
      </ol>
      <h3>JMS Bridge Configuration</h3>
      <p>The JMS Bridge is a <abbr title="Plain Old Java Object">POJO</abbr> that we configure with both source and target
-        JNDI configurations. In the actual example we are programatically creating the Bridge, however the following section
+        JNDI configurations. In the actual example we are programmatically creating the Bridge, however the following section
         describes how you would do this if you wanted to deploy with an actual ActiveMQ Artemis server via the activemq-beans.xml.
 
      <h4>Configuring the Bridge with the JBoss Microcontainer</h4>
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
index 449600a787..c31aba2bbe 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
@@ -91,7 +91,6 @@ public class FailoverConsumerOutstandingCommitTest extends OpenwireArtemisBaseTe
       doTestFailoverConsumerDups(true);
    }
 
-   @SuppressWarnings("unchecked")
    public void doTestFailoverConsumerDups(final boolean watchTopicAdvisories) throws Exception {
 
       server = createBroker();
@@ -204,7 +203,6 @@ public class FailoverConsumerOutstandingCommitTest extends OpenwireArtemisBaseTe
       doTestFailoverConsumerOutstandingSendTx(true);
    }
 
-   @SuppressWarnings("unchecked")
    public void doTestFailoverConsumerOutstandingSendTx(final boolean doActualBrokerCommit) throws Exception {
       final boolean watchTopicAdvisories = true;
       server = createBroker();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
index 95e90219e3..05116a5a95 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
@@ -118,7 +118,6 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
       doTestFailoverConsumerDups(false);
    }
 
-   @SuppressWarnings("unchecked")
    @Test
    @BMRules(
            rules = {
@@ -231,7 +230,6 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
       connection.close();
    }
 
-   @SuppressWarnings("unchecked")
    public void doTestFailoverConsumerDups(final boolean watchTopicAdvisories) throws Exception {
 
       maxConsumers = 4;
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
index 89ba1d7091..e2654e76f8 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
@@ -86,7 +86,6 @@ public class FailoverDuplicateTest extends OpenwireArtemisBaseTest {
       factory.setOptimizeAcknowledge(true);
    }
 
-   @SuppressWarnings("unchecked")
    @Test
    @BMRules(
            rules = {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
index a262033e20..959631761d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
@@ -71,7 +71,6 @@ public class FailoverPrefetchZeroTest extends OpenwireArtemisBaseTest {
       broker.start();
    }
 
-   @SuppressWarnings("unchecked")
    @Test
    @BMRules(
       rules = {@BMRule(
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 00ff4b5418..1557854087 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -220,7 +220,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       connection.close();
    }
 
-   @SuppressWarnings("unchecked")
    @Test
    public void testFailoverCommitReplyLostWithDestinationPathSeparator() throws Exception {
       //the original test validates destinations using forward slash (/) as
@@ -230,7 +229,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       //Artemis doesn't support "/" so far and this test doesn't make sense therefore.
    }
 
-   @SuppressWarnings("unchecked")
    @Test
    @BMRules(
            rules = {
@@ -316,7 +314,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
       connection.close();
    }
 
-   @SuppressWarnings("unchecked")
    @Test
    @BMRules(
            rules = {
@@ -550,7 +547,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
 //      }
 //   }
 //
-   @SuppressWarnings("unchecked")
    public void doTestFailoverConsumerAckLost(final int pauseSeconds) throws Exception {
       broker = createBroker();
       broker.start();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
index 642379fed8..dd398aa947 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
@@ -85,7 +85,6 @@ public class BrokerQueueNetworkWithDisconnectTest extends JmsMultipleBrokersTest
                     " must be received, duplicates are expected, count=" + msgs.getMessageCount(), MESSAGE_COUNT <= msgs.getMessageCount());
    }
 
-   @SuppressWarnings("unchecked")
    public void testNoStuckConnectionsWithTransportDisconnect() throws Exception {
       inactiveDuration = 60000L;
       useDuplexNetworkBridge = true;
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
index cafc701458..0e9ff3eed2 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
@@ -366,7 +366,6 @@ public class TwoBrokerQueueClientsReconnectTest extends JmsMultipleBrokersTestSu
       assertEquals("Client for " + broker2 + " should have received 50% of the messages.", (int) (MESSAGE_COUNT * 0.50), msgsClient2);
    }
 
-   @SuppressWarnings("unchecked")
    public void testDuplicateSend() throws Exception {
       broker1 = "BrokerA";
       broker2 = "BrokerB";
@@ -441,7 +440,6 @@ public class TwoBrokerQueueClientsReconnectTest extends JmsMultipleBrokersTestSu
       }));
    }
 
-   @SuppressWarnings("unchecked")
    public void testDuplicateSendWithNoAuditEnqueueCountStat() throws Exception {
       broker1 = "BrokerA";
       broker2 = "BrokerB";