diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java
index 015c201c..9a5996ec 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java
@@ -88,7 +88,7 @@ public class RetrievalConfig {
 
         if (retrievalFactory == null) {
             if (retrievalSpecificConfig == null) {
-                retrievalSpecificConfig = new FanOutConfig(kinesisClient).streamName(streamName())
+                retrievalSpecificConfig = new FanOutConfig(kinesisClient()).streamName(streamName())
                         .applicationName(applicationName());
             }
             retrievalFactory = retrievalSpecificConfig.retrievalFactory();
diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutConfig.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutConfig.java
index 33f519f9..55ad1012 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutConfig.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutConfig.java
@@ -99,9 +99,9 @@ public class FanOutConfig implements RetrievalSpecificConfig {
     }
 
     private FanOutConsumerRegistration createConsumerRegistration() {
-        String consumerToCreate = ObjectUtils.firstNonNull(consumerName, applicationName);
-        return createConsumerRegistration(kinesisClient,
-                Preconditions.checkNotNull(streamName, "streamName must be set for consumer creation"),
+        String consumerToCreate = ObjectUtils.firstNonNull(consumerName(), applicationName());
+        return createConsumerRegistration(kinesisClient(),
+                Preconditions.checkNotNull(streamName(), "streamName must be set for consumer creation"),
                 Preconditions.checkNotNull(consumerToCreate,
                         "applicationName or consumerName must be set for consumer creation"));
 
@@ -109,8 +109,8 @@ public class FanOutConfig implements RetrievalSpecificConfig {
 
     protected FanOutConsumerRegistration createConsumerRegistration(KinesisAsyncClient client, String stream,
                                                                     String consumerToCreate) {
-        return new FanOutConsumerRegistration(client, stream, consumerToCreate, maxDescribeStreamSummaryRetries,
-                maxDescribeStreamConsumerRetries, registerStreamConsumerRetries, retryBackoffMillis);
+        return new FanOutConsumerRegistration(client, stream, consumerToCreate, maxDescribeStreamSummaryRetries(),
+                maxDescribeStreamConsumerRetries(), registerStreamConsumerRetries(), retryBackoffMillis());
     }
 
 }