diff --git a/src/main/java/org/acra/config/ConfigurationBuilder.java b/src/main/java/org/acra/config/ConfigurationBuilder.java
index b27b69101e..7f912acfc4 100644
--- a/src/main/java/org/acra/config/ConfigurationBuilder.java
+++ b/src/main/java/org/acra/config/ConfigurationBuilder.java
@@ -199,7 +199,7 @@ public ConfigurationBuilder setHttpHeaders(@NonNull Map<String, String> headers)
      * @return this instance
      */
     @NonNull
-    public ConfigurationBuilder setAdditionalDropboxTags(@NonNull String[] additionalDropboxTags) {
+    public ConfigurationBuilder setAdditionalDropboxTags(@NonNull String... additionalDropboxTags) {
         this.additionalDropBoxTags = additionalDropboxTags;
         return this;
     }
@@ -209,7 +209,7 @@ public ConfigurationBuilder setAdditionalDropboxTags(@NonNull String[] additiona
      * @return this instance
      */
     @NonNull
-    public ConfigurationBuilder setAdditionalSharedPreferences(@NonNull String[] additionalSharedPreferences) {
+    public ConfigurationBuilder setAdditionalSharedPreferences(@NonNull String... additionalSharedPreferences) {
         this.additionalSharedPreferences = additionalSharedPreferences;
         return this;
     }
@@ -229,7 +229,7 @@ public ConfigurationBuilder setConnectionTimeout(int connectionTimeout) {
      * @return this instance
      */
     @NonNull
-    public ConfigurationBuilder setCustomReportContent(@NonNull ReportField[] customReportContent) {
+    public ConfigurationBuilder setCustomReportContent(@NonNull ReportField... customReportContent) {
         this.customReportContent = customReportContent;
         return this;
     }
@@ -334,7 +334,7 @@ public ConfigurationBuilder setIncludeDropboxSystemTags(boolean includeDropboxSy
      * @return this instance
      */
     @NonNull
-    public ConfigurationBuilder setLogcatArguments(@NonNull String[] logcatArguments) {
+    public ConfigurationBuilder setLogcatArguments(@NonNull String... logcatArguments) {
         this.logcatArguments = logcatArguments;
         return this;
     }
@@ -616,7 +616,7 @@ public ConfigurationBuilder setSendReportsAtShutdown(boolean sendReportsAtShutdo
      * @return this instance
      */
     @NonNull
-    public ConfigurationBuilder setExcludeMatchingSharedPreferencesKeys(@NonNull String[] excludeMatchingSharedPreferencesKeys) {
+    public ConfigurationBuilder setExcludeMatchingSharedPreferencesKeys(@NonNull String... excludeMatchingSharedPreferencesKeys) {
         this.excludeMatchingSharedPreferencesKeys = excludeMatchingSharedPreferencesKeys;
         return this;
     }
@@ -628,7 +628,7 @@ public ConfigurationBuilder setExcludeMatchingSharedPreferencesKeys(@NonNull Str
      * @return this instance
      */
     @NonNull
-    public ConfigurationBuilder setExcludeMatchingSettingsKeys(@NonNull String[] excludeMatchingSettingsKeys) {
+    public ConfigurationBuilder setExcludeMatchingSettingsKeys(@NonNull String... excludeMatchingSettingsKeys) {
         this.excludeMatchingSettingsKeys = excludeMatchingSettingsKeys;
         return this;
     }
@@ -692,8 +692,9 @@ public ConfigurationBuilder setKeyStoreFactory(KeyStoreFactory keyStoreFactory)
         return this;
     }
 
+    @SafeVarargs
     @NonNull
-    public ConfigurationBuilder setReportSenderFactoryClasses(@NonNull Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses) {
+    public final ConfigurationBuilder setReportSenderFactoryClasses(@NonNull Class<? extends ReportSenderFactory>... reportSenderFactoryClasses) {
         this.reportSenderFactoryClasses = reportSenderFactoryClasses;
         return this;
     }