diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
index 1380832..d5894d5 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
@@ -158,7 +158,6 @@
 	/**
 	 * Instantiates a new DMAAP Topic Source
 	 * 
-	 * @param uebTopicReaderType Implementation type
 	 * @param servers list of servers
 	 * @param topic topic name
 	 * 
@@ -445,7 +444,7 @@
 					
 				String fetchLimitString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
                                                                  "." + topic + 
-                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
+                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_LIMIT_SUFFIX);
 				int fetchLimit = DmaapTopicSource.DEFAULT_LIMIT_FETCH;
 				if (fetchLimitString != null && !fetchLimitString.isEmpty()) {
 					try {
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
index d2aa671..d614d10 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
@@ -96,7 +96,6 @@
 	/**
 	 * Instantiates a new UEB Topic Source
 	 * 
-	 * @param uebTopicSourceType Implementation type
 	 * @param servers list of servers
 	 * @param topic topic name
 	 * 
@@ -261,7 +260,7 @@
 					
 				String fetchLimitString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
                                                                  "." + topic + 
-                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
+                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_LIMIT_SUFFIX);
 				int fetchLimit = UebTopicSource.DEFAULT_LIMIT_FETCH;
 				if (fetchLimitString != null && !fetchLimitString.isEmpty()) {
 					try {