diff --git a/src/reference/antora/modules/ROOT/pages/amqp/receiving-messages/idle-containers.adoc b/src/reference/antora/modules/ROOT/pages/amqp/receiving-messages/idle-containers.adoc
index 239fa97a2b..e5e2bed3ab 100644
--- a/src/reference/antora/modules/ROOT/pages/amqp/receiving-messages/idle-containers.adoc
+++ b/src/reference/antora/modules/ROOT/pages/amqp/receiving-messages/idle-containers.adoc
@@ -25,7 +25,7 @@ The following example shows how to do so in XML and in Java (for both a `SimpleM
 [source, java]
 ----
 @Bean
-public SimpleMessageListenerContainer(ConnectionFactory connectionFactory) {
+public SimpleMessageListenerContainer smlc(ConnectionFactory connectionFactory) {
     SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory);
     ...
     container.setIdleEventInterval(60000L);
diff --git a/src/reference/antora/modules/ROOT/pages/logging.adoc b/src/reference/antora/modules/ROOT/pages/logging.adoc
index cf9b0ff0e5..2e98f90c50 100644
--- a/src/reference/antora/modules/ROOT/pages/logging.adoc
+++ b/src/reference/antora/modules/ROOT/pages/logging.adoc
@@ -315,8 +315,12 @@ You can add custom client properties by adding either string properties or more
 
 Each appender supports adding client properties to the RabbitMQ connection.
 
-The following example shows how to add a custom client property for logback:
+The following example shows how to add a custom client property:
 
+[tabs]
+======
+logback::
++
 [source, xml]
 ----
 <appender name="AMQP" ...>
@@ -326,7 +330,8 @@ The following example shows how to add a custom client property for logback:
 </appender>
 ----
 
-.log4j2
+log4j2::
++
 [source, xml]
 ----
 <Appenders>
@@ -338,6 +343,7 @@ The following example shows how to add a custom client property for logback:
     </RabbitMQ>
 </Appenders>
 ----
+======
 
 The properties are a comma-delimited list of `key:value` pairs.
 Keys and values cannot contain commas or colons.
diff --git a/src/reference/antora/modules/ROOT/pages/rabbitmq-amqp-client.adoc b/src/reference/antora/modules/ROOT/pages/rabbitmq-amqp-client.adoc
index ae3cbf1555..4e40fc892f 100644
--- a/src/reference/antora/modules/ROOT/pages/rabbitmq-amqp-client.adoc
+++ b/src/reference/antora/modules/ROOT/pages/rabbitmq-amqp-client.adoc
@@ -9,7 +9,10 @@ For that purpose a https://qpid.apache.org/components/jms/index.html[JMS bridge]
 
 This dependency has to be added to the project to be able to interact with RabbitMQ AMQP 1.0 support:
 
-.maven
+[tabs]
+======
+Maven::
++
 [source,xml,subs="+attributes"]
 ----
 <dependency>
@@ -19,11 +22,13 @@ This dependency has to be added to the project to be able to interact with Rabbi
 </dependency>
 ----
 
-.gradle
+Gradle::
++
 [source,groovy,subs="+attributes"]
 ----
 compile 'org.springframework.amqp:spring-rabbitmq-client:{project-version}'
 ----
+======
 
 The `spring-rabbit` (for AMQP 0.9.1 protocol) comes as a transitive dependency for reusing some common API in this new client, for example, exceptions, the `@RabbitListener` support.
 It is not necessary to use both functionality in the target project, but RabbitMQ allows both AMQP 0.9.1 and 1.0 co-exists.
diff --git a/src/reference/antora/modules/ROOT/pages/stream.adoc b/src/reference/antora/modules/ROOT/pages/stream.adoc
index b1e35babbf..2aa38a71f9 100644
--- a/src/reference/antora/modules/ROOT/pages/stream.adoc
+++ b/src/reference/antora/modules/ROOT/pages/stream.adoc
@@ -8,7 +8,10 @@ Version 2.4 introduces initial support for the {rabbitmq-github}/rabbitmq-stream
 
 Add the `spring-rabbit-stream` dependency to your project:
 
-.maven
+[tabs]
+======
+Maven::
++
 [source,xml,subs="+attributes"]
 ----
 <dependency>
@@ -18,11 +21,13 @@ Add the `spring-rabbit-stream` dependency to your project:
 </dependency>
 ----
 
-.gradle
+Gradle::
++
 [source,groovy,subs="+attributes"]
 ----
 compile 'org.springframework.amqp:spring-rabbit-stream:{project-version}'
 ----
+======
 
 You can provision the queues as normal, using a `RabbitAdmin` bean, using the `QueueBuilder.stream()` method to designate the queue type.
 For example:
@@ -97,7 +102,7 @@ public void setMessageConverter(MessageConverter messageConverter) {
 public void setStreamConverter(StreamMessageConverter streamConverter) {
 }
 
-public synchronized void setProducerCustomizer(ProducerCustomizer producerCustomizer) {
+public void setProducerCustomizer(ProducerCustomizer producerCustomizer) {
 }
 ----