diff --git a/build.gradle b/build.gradle
index bc79d88..22a4618 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.8'
+    id 'org.springframework.boot' version '2.7.9'
     id 'io.spring.dependency-management' version '1.1.0'
     id 'java'
 }
diff --git a/src/main/java/eu/openaire/urls_controller/Application.java b/src/main/java/eu/openaire/urls_controller/Application.java
index 4d00526..4f4f92a 100644
--- a/src/main/java/eu/openaire/urls_controller/Application.java
+++ b/src/main/java/eu/openaire/urls_controller/Application.java
@@ -1,6 +1,6 @@
 package eu.openaire.urls_controller;
 
-import eu.openaire.urls_controller.controllers.UrlController;
+import eu.openaire.urls_controller.services.UrlsServiceImpl;
 import eu.openaire.urls_controller.util.FileUtils;
 import eu.openaire.urls_controller.util.UriBuilder;
 import org.slf4j.Logger;
@@ -49,7 +49,7 @@ public class Application {
     public void preDestroy() {
         logger.info("Shutting down the threads..");
 
-        shutdownThreads(UrlController.insertsExecutor);
+        shutdownThreads(UrlsServiceImpl.insertsExecutor);
         shutdownThreads(FileUtils.hashMatchingExecutor);
 
         logger.info("Exiting..");
diff --git a/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java b/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java
index 12b51ca..97e72ff 100644
--- a/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java
+++ b/src/main/java/eu/openaire/urls_controller/configuration/ImpalaConnector.java
@@ -54,7 +54,7 @@ public class ImpalaConnector {
     private void createDatabase()
     {
         if ( isTestEnvironment ) {
-            logger.info("Going to create (if not exist) the test-database \"" + testDatabaseName + "\" and its tables. Also will fill some tables with data from the initial-database \"" + initialDatabaseName + "\".");
+            logger.info("Going to create (if not exist) the TEST-database \"" + testDatabaseName + "\" and its tables. Also will fill some tables with data from the initial-database \"" + initialDatabaseName + "\".");
             jdbcTemplate.execute("CREATE DATABASE IF NOT EXISTS " + testDatabaseName);
 
             jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS " + testDatabaseName + ".publication stored as parquet as select * from " + initialDatabaseName + ".publication");
@@ -89,7 +89,7 @@ public class ImpalaConnector {
         jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS " + databaseName + ".payload (id string, original_url string, actual_url string, `date` bigint, mimetype string, size string, `hash` string, `location` string, provenance string) stored as parquet");
         jdbcTemplate.execute("COMPUTE STATS " + databaseName + ".payload");
 
-        logger.info("The " + (isTestEnvironment ? "test-" : "") + "database \"" + databaseName + "\" and its tables were created or validated.");
+        logger.info("The " + (isTestEnvironment ? "TEST-" : "") + "database \"" + databaseName + "\" and its tables were created or validated.");
     }