diff --git a/.clang-format b/.clang-format
index 1cba5ea8..a1b3a2e2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,11 +1,9 @@
 #AlignAfterOpenBracket: BlockIndent
 AlignAfterOpenBracket: AlwaysBreak
 AlignEscapedNewlines: DontAlign
-AlignOperands: true
 AlignTrailingComments: false
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -36,7 +34,6 @@ BraceWrapping:
   SplitEmptyFunction: false
   SplitEmptyNamespace: true
   SplitEmptyRecord: false
-AlignEscapedNewlines: DontAlign
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 BreakStringLiterals: true
diff --git a/include/roar/session/session.hpp b/include/roar/session/session.hpp
index a24ef4ef..eea89ced 100644
--- a/include/roar/session/session.hpp
+++ b/include/roar/session/session.hpp
@@ -599,7 +599,7 @@ namespace Roar
                             auto request = Request<BodyT>(self->req_.release(), std::move(self->originalExtensions_));
                             try
                             {
-                                self->promise_->template resolve(Detail::ref(*self->session_), Detail::cref(request));
+                                self->promise_->resolve(Detail::ref(*self->session_), Detail::cref(request));
                             }
                             catch (std::exception const& exc)
                             {
@@ -635,7 +635,7 @@ namespace Roar
                             {
                                 try
                                 {
-                                    self->promise_->template resolve(
+                                    self->promise_->resolve(
                                         Detail::ref(*self->session_), Detail::cref(self->req_), self);
                                 }
                                 catch (std::exception const& exc)