diff --git a/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
index ee9e1ed9..def1dda5 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Optional;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.net.URIBuilder;
 
@@ -73,7 +72,7 @@ public class YoutubeFaviconFetcher extends AbstractFaviconFetcher {
 				response = fetchForPlaylist(youtube, googleAuthKey, playlistId.get().getValue());
 			}
 
-			if (MapUtils.isEmpty(response) || CollectionUtils.isEmpty(response.getItems())) {
+			if (response == null || response.isEmpty() || CollectionUtils.isEmpty(response.getItems())) {
 				log.debug("youtube api returned no items");
 				return null;
 			}
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java
index 4d50c2a1..6675b67a 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java
@@ -19,7 +19,7 @@ import liquibase.changelog.ChangeLogParameters;
 import liquibase.command.CommandScope;
 import liquibase.command.core.UpdateCommandStep;
 import liquibase.command.core.helpers.DatabaseChangelogCommandStep;
-import liquibase.command.core.helpers.DbUrlConnectionCommandStep;
+import liquibase.command.core.helpers.DbUrlConnectionArgumentsCommandStep;
 import liquibase.command.core.helpers.ShowSummaryArgument;
 import liquibase.database.Database;
 import liquibase.database.DatabaseFactory;
@@ -67,7 +67,7 @@ public class DatabaseStartupService implements Managed {
 
 					Scope.child(scopeObjects, () -> {
 						CommandScope command = new CommandScope(UpdateCommandStep.COMMAND_NAME);
-						command.addArgumentValue(DbUrlConnectionCommandStep.DATABASE_ARG, database);
+						command.addArgumentValue(DbUrlConnectionArgumentsCommandStep.DATABASE_ARG, database);
 						command.addArgumentValue(UpdateCommandStep.CHANGELOG_FILE_ARG, "migrations.xml");
 						command.addArgumentValue(DatabaseChangelogCommandStep.CHANGELOG_PARAMETERS, new ChangeLogParameters(database));
 						command.addArgumentValue(ShowSummaryArgument.SHOW_SUMMARY, UpdateSummaryEnum.OFF);