diff --git a/github-plugin/src/main/java/io/freefair/gradle/plugins/github/internal/GitUtils.java b/github-plugin/src/main/java/io/freefair/gradle/plugins/github/internal/GitUtils.java
index bc32d6e6..8b0cd139 100644
--- a/github-plugin/src/main/java/io/freefair/gradle/plugins/github/internal/GitUtils.java
+++ b/github-plugin/src/main/java/io/freefair/gradle/plugins/github/internal/GitUtils.java
@@ -32,7 +32,7 @@ public static String findSlug(Project project) {
 
         String travisSlug = findTravisSlug(project).getOrNull();
 
-        if (travisSlug != null) {
+        if (travisSlug != null && !travisSlug.isEmpty()) {
             return travisSlug;
         }
 
diff --git a/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/LombokPlugin.java b/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/LombokPlugin.java
index a1e90615..b5a450ed 100644
--- a/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/LombokPlugin.java
+++ b/lombok-plugin/src/main/java/io/freefair/gradle/plugins/lombok/LombokPlugin.java
@@ -53,7 +53,7 @@ public void apply(Project project) {
     private void configureJavaPluginDefaults() {
         JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
 
-        project.getTasks().withType(LombokTask.class, lombokTask -> {
+        project.getTasks().withType(LombokTask.class).configureEach(lombokTask -> {
             JavaToolchainService javaToolchainService = project.getExtensions().getByType(JavaToolchainService.class);
             Provider<JavaLauncher> launcherProvider = javaToolchainService.launcherFor(javaPluginExtension.getToolchain());
             lombokTask.getLauncher().convention(launcherProvider);