diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 1b1f151040c..c78b6f2bb8e 100644
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -290,10 +290,10 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
                 addObjectMappers(objectMappersAgg.mappers.toArray(new ObjectMapper[objectMappersAgg.mappers.size()]));
                 mapper.addObjectMapperListener(objectMapperListener, false);
 
-                mappers = newMapBuilder(mappers).put(mapper.type(), mapper).map();
                 for (DocumentTypeListener typeListener : typeListeners) {
                     typeListener.created(mapper.type());
                 }
+                mappers = newMapBuilder(mappers).put(mapper.type(), mapper).map();
                 return mapper;
             }
         }
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
index 9aaf02b01b2..a7f135bd61b 100644
--- a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
+++ b/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
@@ -60,7 +60,7 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
     private final RealTimePercolatorOperationListener realTimePercolatorOperationListener = new RealTimePercolatorOperationListener();
     private final PercolateTypeListener percolateTypeListener = new PercolateTypeListener();
 
-    private volatile boolean realTimePercolatorEnabled = false;
+    private boolean realTimePercolatorEnabled = false;
 
     @Inject
     public PercolatorQueriesRegistry(ShardId shardId, @IndexSettings Settings indexSettings, IndexQueryParserService queryParserService,
@@ -94,19 +94,15 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
         percolateQueries.clear();
     }
 
-    void enableRealTimePercolator() {
-        logger.trace("trying to enable realtime percolation for index [{}] and shard[{}] on node[{}]", shardId.index(), shardId.id(), nodeName());
+    synchronized void enableRealTimePercolator() {
         if (!realTimePercolatorEnabled) {
-            logger.debug("enabling realtime percolating for index [{}] and shard[{}] on node[{}]", shardId.index(), shardId.id(), nodeName());
             indexingService.addListener(realTimePercolatorOperationListener);
             realTimePercolatorEnabled = true;
         }
     }
 
-    void disableRealTimePercolator() {
-        logger.trace("trying to disable realtime percolation for index [{}] and shard[{}] on node[{}]", shardId.index(), shardId.id(), nodeName());
+    synchronized void disableRealTimePercolator() {
         if (realTimePercolatorEnabled) {
-            logger.debug("disabling realtime percolating for index [{}] and shard[{}] on node[{}]", shardId.index(), shardId.id(), nodeName());
             indexingService.removeListener(realTimePercolatorOperationListener);
             realTimePercolatorEnabled = false;
         }