diff --git a/common_helper.go b/common_helper.go
index 85754ba..39adcf8 100644
--- a/common_helper.go
+++ b/common_helper.go
@@ -85,8 +85,8 @@
 			return tenant{}, dbError{errorCode, reason}
 		} else {
 			// acquire a read lock as this cache has 1 writer as well
-			tenantCache.RLock()
-			defer tenantCache.RUnlock()
+			tenantCachelock.RLock()
+			defer tenantCachelock.RUnlock()
 			return tenantCache[scopeuuid], dbError{}
 		}
 	} else {
diff --git a/init.go b/init.go
index f0161f3..5cae849 100644
--- a/init.go
+++ b/init.go
@@ -19,14 +19,11 @@
 	analyticsCollectionInterval        = "apidanalytics_collection_interval" // config in seconds
 	analyticsCollectionIntervalDefault = "120"
 
-	analyticsCollectionNoFiles        = "apidanalytics_collection_no_files" // config
-	analyticsCollectionNoFilesDefault = "1"
-
 	analyticsUploadInterval        = "apidanalytics_upload_interval" // config in seconds
 	analyticsUploadIntervalDefault = "5"
 
 	analyticsBufferChannelSize  = "apidanalytics_buffer_channel_size"
-	analyticsBufferChannelSizeDefault = 10 // number of slots
+	analyticsBufferChannelSizeDefault = 100 // number of slots
 
 	uapServerBase = "apidanalytics_uap_server_base" // config
 
@@ -133,9 +130,8 @@
 	localAnalyticsFailedDir = filepath.Join(localAnalyticsBaseDir, "failed")
 	localAnalyticsRecoveredDir = filepath.Join(localAnalyticsBaseDir, "recovered")
 
-	// set default config for collection interval and number of files per interval
+	// set default config for collection interval
 	config.SetDefault(analyticsCollectionInterval, analyticsCollectionIntervalDefault)
-	config.SetDefault(analyticsCollectionNoFiles, analyticsCollectionNoFilesDefault)
 
 	// set default config for local caching
 	config.SetDefault(useCaching, useCachingDefault)