diff --git a/Tapeti.Cmd/ConsoleHelper/ConsoleWrapper.cs b/Tapeti.Cmd/ConsoleHelper/ConsoleWrapper.cs
index 05f8541..4f5aaee 100644
--- a/Tapeti.Cmd/ConsoleHelper/ConsoleWrapper.cs
+++ b/Tapeti.Cmd/ConsoleHelper/ConsoleWrapper.cs
@@ -144,7 +144,7 @@ namespace Tapeti.Cmd.ConsoleHelper
             public void Confirm(string message)
             {
                 WriteLine(message);
-                TryReadKey(false, out var _);
+                TryReadKey(false, out _);
             }
 
 
diff --git a/Tapeti.Cmd/Verbs/PurgeVerb.cs b/Tapeti.Cmd/Verbs/PurgeVerb.cs
index bd99cd2..9d7edd2 100644
--- a/Tapeti.Cmd/Verbs/PurgeVerb.cs
+++ b/Tapeti.Cmd/Verbs/PurgeVerb.cs
@@ -1,5 +1,4 @@
-using System;
-using CommandLine;
+using CommandLine;
 using RabbitMQ.Client;
 using Tapeti.Cmd.ConsoleHelper;
 
diff --git a/Tapeti.Cmd/Verbs/RemoveQueueVerb.cs b/Tapeti.Cmd/Verbs/RemoveQueueVerb.cs
index 59066c3..9b7695b 100644
--- a/Tapeti.Cmd/Verbs/RemoveQueueVerb.cs
+++ b/Tapeti.Cmd/Verbs/RemoveQueueVerb.cs
@@ -1,5 +1,4 @@
-using System;
-using CommandLine;
+using CommandLine;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Exceptions;
 using Tapeti.Cmd.ConsoleHelper;
diff --git a/Tapeti.Flow/Default/FlowStore.cs b/Tapeti.Flow/Default/FlowStore.cs
index 2a9a8ad..9f3b508 100644
--- a/Tapeti.Flow/Default/FlowStore.cs
+++ b/Tapeti.Flow/Default/FlowStore.cs
@@ -30,7 +30,7 @@ namespace Tapeti.Flow.Default
         private readonly ConcurrentDictionary<Guid, CachedFlowState> flowStates = new ConcurrentDictionary<Guid, CachedFlowState>();
         private readonly ConcurrentDictionary<Guid, Guid> continuationLookup = new ConcurrentDictionary<Guid, Guid>();
         private readonly LockCollection<Guid> locks = new LockCollection<Guid>(EqualityComparer<Guid>.Default);
-        private HashSet<string> validatedMethods = null;
+        private HashSet<string> validatedMethods;
 
         private readonly IFlowRepository repository;
         private readonly ITapetiConfig config;
diff --git a/Tapeti.Flow/FlowHelpers/MethodSerializer.cs b/Tapeti.Flow/FlowHelpers/MethodSerializer.cs
index 1784873..9f8b09e 100644
--- a/Tapeti.Flow/FlowHelpers/MethodSerializer.cs
+++ b/Tapeti.Flow/FlowHelpers/MethodSerializer.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using System.Text.RegularExpressions;
 
 namespace Tapeti.Flow.FlowHelpers
diff --git a/Tapeti/Config/IMessageContext.cs b/Tapeti/Config/IMessageContext.cs
index e3a0e05..ac6a0e5 100644
--- a/Tapeti/Config/IMessageContext.cs
+++ b/Tapeti/Config/IMessageContext.cs
@@ -1,6 +1,7 @@
 using System;
 
 // ReSharper disable UnusedMemberInSuper.Global - public API
+// ReSharper disable UnusedMember.Global
 
 namespace Tapeti.Config
 {
diff --git a/Tapeti/Connection/TapetiConsumer.cs b/Tapeti/Connection/TapetiConsumer.cs
index 58fddeb..6d67241 100644
--- a/Tapeti/Connection/TapetiConsumer.cs
+++ b/Tapeti/Connection/TapetiConsumer.cs
@@ -78,7 +78,8 @@ namespace Tapeti.Connection
                 };
                 
                 var exceptionContext = new ExceptionStrategyContext(emptyContext, dispatchException);
-                HandleException(exceptionContext);
+                await HandleException(exceptionContext);
+                
                 return exceptionContext.ConsumeResult;
             }
         }
@@ -132,7 +133,7 @@ namespace Tapeti.Connection
             catch (Exception invokeException)
             {
                 var exceptionContext = new ExceptionStrategyContext(context, invokeException);
-                HandleException(exceptionContext);
+                await HandleException(exceptionContext);
 
                 await binding.Cleanup(context, exceptionContext.ConsumeResult);
                 return exceptionContext.ConsumeResult;
@@ -140,7 +141,7 @@ namespace Tapeti.Connection
         }
 
 
-        private void HandleException(ExceptionStrategyContext exceptionContext)
+        private async Task HandleException(ExceptionStrategyContext exceptionContext)
         {
             if (cancellationToken.IsCancellationRequested && IgnoreExceptionDuringShutdown(exceptionContext.Exception))
             {
@@ -151,7 +152,7 @@ namespace Tapeti.Connection
 
             try
             {
-                exceptionStrategy.HandleException(exceptionContext);
+                await exceptionStrategy.HandleException(exceptionContext);
             }
             catch (Exception strategyException)
             {
diff --git a/Tapeti/Default/ConsoleLogger.cs b/Tapeti/Default/ConsoleLogger.cs
index d2787f3..ff1f626 100644
--- a/Tapeti/Default/ConsoleLogger.cs
+++ b/Tapeti/Default/ConsoleLogger.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Text;
 using Tapeti.Config;
 
+// ReSharper disable UnusedMember.Global - public API
+
 namespace Tapeti.Default
 {
     /// <inheritdoc />
@@ -17,9 +19,6 @@ namespace Tapeti.Default
         /// </summary>
         public class WithMessageLogging : ConsoleLogger
         {
-            /// <inheritdoc />
-            public WithMessageLogging() : base() { }
-
             internal override bool IncludeMessageBody() => true;
         }
 
diff --git a/Tapeti/Default/NackExceptionStrategy.cs b/Tapeti/Default/NackExceptionStrategy.cs
index 06510f2..e760e20 100644
--- a/Tapeti/Default/NackExceptionStrategy.cs
+++ b/Tapeti/Default/NackExceptionStrategy.cs
@@ -1,4 +1,5 @@
-using Tapeti.Config;
+using System.Threading.Tasks;
+using Tapeti.Config;
 
 namespace Tapeti.Default
 {
@@ -9,9 +10,10 @@ namespace Tapeti.Default
     public class NackExceptionStrategy : IExceptionStrategy
     {
         /// <inheritdoc />
-        public void HandleException(IExceptionStrategyContext context)
+        public Task HandleException(IExceptionStrategyContext context)
         {
             context.SetConsumeResult(ConsumeResult.Error);
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/Tapeti/Default/RequeueExceptionStrategy.cs b/Tapeti/Default/RequeueExceptionStrategy.cs
index 87fa8a2..f91922b 100644
--- a/Tapeti/Default/RequeueExceptionStrategy.cs
+++ b/Tapeti/Default/RequeueExceptionStrategy.cs
@@ -1,4 +1,5 @@
-using Tapeti.Config;
+using System.Threading.Tasks;
+using Tapeti.Config;
 
 // ReSharper disable UnusedMember.Global
 
@@ -20,9 +21,10 @@ namespace Tapeti.Default
     public class RequeueExceptionStrategy : IExceptionStrategy
     {
         /// <inheritdoc />
-        public void HandleException(IExceptionStrategyContext context)
+        public Task HandleException(IExceptionStrategyContext context)
         {
             context.SetConsumeResult(ConsumeResult.Requeue);
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/Tapeti/IExceptionStrategy.cs b/Tapeti/IExceptionStrategy.cs
index 5aeb5e1..b498cf1 100644
--- a/Tapeti/IExceptionStrategy.cs
+++ b/Tapeti/IExceptionStrategy.cs
@@ -1,4 +1,5 @@
-using Tapeti.Config;
+using System.Threading.Tasks;
+using Tapeti.Config;
 
 namespace Tapeti
 {
@@ -12,6 +13,6 @@ namespace Tapeti
         /// </summary>
         /// <param name="context">The exception strategy context containing the necessary data including the message context and the thrown exception.
         /// Also proivdes methods for the exception strategy to indicate how the message should be handled.</param>
-        void HandleException(IExceptionStrategyContext context);
+        Task HandleException(IExceptionStrategyContext context);
     }
 }