diff --git a/pom.xml b/pom.xml
index 81c5f754bc..7341ff2b53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.6</version>
+            <version>8.0.23</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index f85be22624..2673df652d 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -1620,7 +1620,9 @@ public class Server {
     
     private static void applyAllWorldTransfers() {
         try (Connection con = DatabaseConnection.getConnection();
-                PreparedStatement ps = con.prepareStatement("SELECT * FROM worldtransfers WHERE completionTime IS NULL")) {
+                PreparedStatement ps = con.prepareStatement("SELECT * FROM worldtransfers WHERE completionTime IS NULL",
+                        ResultSet.TYPE_SCROLL_SENSITIVE,
+                        ResultSet.CONCUR_READ_ONLY)) {
             ResultSet rs = ps.executeQuery();
             List<Integer> removedTransfers = new LinkedList<Integer>();
             while(rs.next()) {
diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java
index 261238e411..c87619d310 100644
--- a/src/main/java/server/maps/MapleHiredMerchant.java
+++ b/src/main/java/server/maps/MapleHiredMerchant.java
@@ -30,7 +30,6 @@ import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import client.inventory.manipulator.MapleKarmaManipulator;
 import client.processor.npc.FredrickProcessor;
-import com.mysql.jdbc.Statement;
 import config.YamlConfig;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -309,7 +308,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
                             }
                             merchantMesos += price;
                             
-                            try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET MerchantMesos = ? WHERE id = ?", Statement.RETURN_GENERATED_KEYS)) {
+                            try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET MerchantMesos = ? WHERE id = ?", PreparedStatement.RETURN_GENERATED_KEYS)) {
                                 ps.setInt(1, (int) Math.min(merchantMesos, Integer.MAX_VALUE));
                                 ps.setInt(2, ownerId);
                                 ps.executeUpdate();
@@ -383,7 +382,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         } else {
                 try {
                         Connection con = DatabaseConnection.getConnection();
-                        PreparedStatement ps = con.prepareStatement("UPDATE characters SET HasMerchant = 0 WHERE id = ?", Statement.RETURN_GENERATED_KEYS);
+                        PreparedStatement ps = con.prepareStatement("UPDATE characters SET HasMerchant = 0 WHERE id = ?", PreparedStatement.RETURN_GENERATED_KEYS);
                         ps.setInt(1, ownerId);
                         ps.executeUpdate();
 
@@ -442,7 +441,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
                     player.setHasMerchant(false);
             } else {
                     Connection con = DatabaseConnection.getConnection();
-                    try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET HasMerchant = 0 WHERE id = ?", Statement.RETURN_GENERATED_KEYS)) {
+                    try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET HasMerchant = 0 WHERE id = ?", PreparedStatement.RETURN_GENERATED_KEYS)) {
                             ps.setInt(1, ownerId);
                             ps.executeUpdate();
                     }