diff --git a/src/main/java/org/elasticsearch/watcher/actions/email/service/InternalEmailService.java b/src/main/java/org/elasticsearch/watcher/actions/email/service/InternalEmailService.java
index 4b27f0d203f..7bdd387a407 100644
--- a/src/main/java/org/elasticsearch/watcher/actions/email/service/InternalEmailService.java
+++ b/src/main/java/org/elasticsearch/watcher/actions/email/service/InternalEmailService.java
@@ -79,14 +79,15 @@ public class InternalEmailService extends AbstractLifecycleComponent<InternalEma
 
     void reset(Settings nodeSettings) {
         Settings.Builder builder = Settings.builder();
+        String prefix = "watcher.actions.email.service";
         for (String setting : settings.getAsMap().keySet()) {
             if (setting.startsWith("watcher.actions.email.service")) {
-                builder.put(setting, settings.get(setting));
+                builder.put(setting.substring(prefix.length()+1), settings.get(setting));
             }
         }
         for (String setting : nodeSettings.getAsMap().keySet()) {
             if (setting.startsWith("watcher.actions.email.service")) {
-                builder.put(setting, settings.get(setting));
+                builder.put(setting.substring(prefix.length()+1), settings.get(setting));
             }
         }
         accounts = createAccounts(builder.build(), logger);
diff --git a/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentUtils.java b/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentUtils.java
index 98046c0e855..5899d39f5cc 100644
--- a/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentUtils.java
+++ b/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentUtils.java
@@ -13,6 +13,7 @@ import org.elasticsearch.common.compress.Compressor;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 
@@ -30,18 +31,8 @@ public class WatcherXContentUtils {
 
     public static Tuple<XContentType, Object> convertToObject(BytesReference bytes) throws ElasticsearchParseException {
         try {
-            XContentParser parser;
-            XContentType contentType;
-            Compressor compressor = CompressorFactory.compressor(bytes);
-            if (compressor != null) {
-                StreamInput compressedStreamInput = compressor.streamInput(bytes.streamInput());
-                contentType = XContentFactory.xContentType(compressedStreamInput);
-                parser = XContentFactory.xContent(contentType).createParser(compressedStreamInput);
-            } else {
-                contentType = XContentFactory.xContentType(bytes);
-                parser = XContentFactory.xContent(contentType).createParser(bytes.streamInput());
-            }
-            return Tuple.tuple(contentType, readValue(parser, parser.nextToken()));
+            XContentParser parser = XContentHelper.createParser(bytes);
+            return Tuple.tuple(parser.contentType(), readValue(parser, parser.nextToken()));
         } catch (IOException e) {
             throw new ElasticsearchParseException("Failed to parse content to map", e);
         }
diff --git a/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java b/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java
index a7bd80beb78..1a21c500c1a 100644
--- a/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java
+++ b/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.when;
 public class CompareConditionSearchTests extends AbstractWatcherIntegrationTests {
 
     @Test
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11692") //nocommit
     public void testExecute_withAggs() throws Exception {
 
         client().admin().indices().prepareCreate("my-index")
diff --git a/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java b/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java
index dba8bd03440..72162f77406 100644
--- a/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java
+++ b/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java
@@ -49,6 +49,7 @@ public class ScriptConditionSearchTests extends AbstractWatcherIntegrationTests
     }
 
     @Test
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11692") //nocommit
     public void testExecute_withAggs() throws Exception {
 
         client().admin().indices().prepareCreate("my-index")
diff --git a/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java b/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
index 0937e753b7f..a84a87038ec 100644
--- a/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
+++ b/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
@@ -72,16 +72,17 @@ public class SearchInputTests extends ElasticsearchIntegrationTest {
 
     @Override
     public Settings nodeSettings(int nodeOrdinal) {
-        Path tempDir = createTempDir();
-        Path configPath = tempDir.resolve("config").resolve("scripts");
+        final Path tempDir = createTempDir();
+        final Path configPath = tempDir.resolve("config");
+        final Path scriptPath = configPath.resolve("scripts");
         try {
-            Files.createDirectories(configPath);
+            Files.createDirectories(scriptPath);
         } catch (IOException e) {
             throw new RuntimeException("failed to create config dir");
 
         }
         try (InputStream stream  = SearchInputTests.class.getResourceAsStream("/org/elasticsearch/watcher/input/search/config/scripts/test_disk_template.mustache");
-            OutputStream out = Files.newOutputStream(configPath.resolve("test_disk_template.mustache"))) {
+            OutputStream out = Files.newOutputStream(scriptPath.resolve("test_disk_template.mustache"))) {
             Streams.copy(stream, out);
         } catch (IOException e) {
             throw new RuntimeException("failed to copy mustache template");
diff --git a/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java b/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java
index bf11468f8af..060daded92d 100644
--- a/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java
+++ b/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java
@@ -60,7 +60,7 @@ public class WatcherDateTimeUtilsTests extends ElasticsearchTestCase {
                 .put(value + "s", TimeValue.timeValueSeconds(value))
                 .put(value + "m", TimeValue.timeValueMinutes(value))
                 .put(value + "h", TimeValue.timeValueHours(value))
-                .put(value + "", TimeValue.timeValueMillis(value))
+               // .put(value + "", TimeValue.timeValueMillis(value)) nocommit this is not allowed in 2.0 anymore - we need to upgrade those settings?
                 .build();
 
         String key = randomFrom(values.keySet().toArray(new String[values.size()]));
@@ -82,7 +82,7 @@ public class WatcherDateTimeUtilsTests extends ElasticsearchTestCase {
                 .put(value + "s", TimeValue.timeValueSeconds(value))
                 .put(value + "m", TimeValue.timeValueMinutes(value))
                 .put(value + "h", TimeValue.timeValueHours(value))
-                .put(value + "", TimeValue.timeValueMillis(value))
+                //.put(value + "", TimeValue.timeValueMillis(value)) nocommit this is not allowed in 2.0 anymore - we need to upgrade those settings?
                 .build();
 
         String key = randomFrom(values.keySet().toArray(new String[values.size()]));
diff --git a/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java b/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java
index 6f6c9a68a42..47fa2759e66 100644
--- a/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java
+++ b/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTests.java
@@ -654,7 +654,7 @@ public abstract class AbstractWatcherIntegrationTests extends ElasticsearchInteg
                 "  cluster: cluster:monitor/nodes/info, cluster:monitor/nodes/liveness\n" +
                 "\n" +
                 "monitor:\n" +
-                "  cluster: monitor_watcher, cluster:monitor/nodes/info, cluster:monitor/nodes/liveness\\\n"
+                "  cluster: monitor_watcher, cluster:monitor/nodes/info, cWatcherDateTimeUtilsTestsluster:monitor/nodes/liveness\\\n"
                 ;
 
 
diff --git a/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java b/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
index 13a4cb3ee0c..069f152740a 100644
--- a/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
+++ b/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
@@ -70,16 +70,17 @@ public class SearchTransformTests extends ElasticsearchIntegrationTest {
 
     @Override
     public Settings nodeSettings(int nodeOrdinal) {
-        Path tempDir = createTempDir();
-        Path configPath = tempDir.resolve("config").resolve("scripts");
+        final Path tempDir = createTempDir();
+        final Path configPath = tempDir.resolve("config");
+        final Path scriptPath = configPath.resolve("scripts");
         try {
-            Files.createDirectories(configPath);
+            Files.createDirectories(scriptPath);
         } catch (IOException e) {
             throw new RuntimeException("failed to create config dir");
 
         }
         try (InputStream stream  = SearchTransformTests.class.getResourceAsStream("/org/elasticsearch/watcher/transform/search/config/scripts/test_disk_template.mustache");
-             OutputStream out = Files.newOutputStream(configPath.resolve("test_disk_template.mustache"))) {
+            OutputStream out = Files.newOutputStream(scriptPath.resolve("test_disk_template.mustache"))) {
             Streams.copy(stream, out);
         } catch (IOException e) {
             throw new RuntimeException("failed to copy mustache template");
diff --git a/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java b/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java
index 0343a06caeb..cfcdb8fa3cb 100644
--- a/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java
+++ b/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java
@@ -51,7 +51,7 @@ public class WatchLockServiceTests extends ElasticsearchTestCase {
         try {
             lockService.acquire("_name");
             fail("exception expected");
-        } catch (IllegalStateException e) {
+        } catch (IllegalArgumentException e) {
             assertThat(e.getMessage(), containsString("Lock already acquired"));
         }
         lock1.release();