diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index 463a2cc..cefcd22 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -148,7 +148,7 @@
 		</repository>
 		<repository>
 			<id>placeholderapi</id>
-			<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+			<url>https://repo.extendedclip.com/releases/</url>
 		</repository>
 		<repository>
 			<id>jitpack.io</id>
@@ -192,7 +192,7 @@
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.11.4</version>
+			<version>2.11.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/Bukkit/src/main/java/nl/svenar/powerranks/bukkit/PowerRanks.java b/Bukkit/src/main/java/nl/svenar/powerranks/bukkit/PowerRanks.java
index 750a4b2..924df7c 100644
--- a/Bukkit/src/main/java/nl/svenar/powerranks/bukkit/PowerRanks.java
+++ b/Bukkit/src/main/java/nl/svenar/powerranks/bukkit/PowerRanks.java
@@ -453,7 +453,7 @@ public void run() {
 		new BukkitRunnable() {
 			@Override
 			public void run() {
-				permissionRegistry.tick();
+				permissionRegistry.tick(256);
 			}
 		}.runTaskTimer(this, 1, 1);
 	}
diff --git a/Core/src/main/java/nl/svenar/powerranks/common/storage/PermissionRegistry.java b/Core/src/main/java/nl/svenar/powerranks/common/storage/PermissionRegistry.java
index af90dfe..792662b 100644
--- a/Core/src/main/java/nl/svenar/powerranks/common/storage/PermissionRegistry.java
+++ b/Core/src/main/java/nl/svenar/powerranks/common/storage/PermissionRegistry.java
@@ -17,9 +17,10 @@ public void queuePermission(String permissionNode) {
         this.queue.add(permissionNode);
     }
 
-    public void tick() {
-        String permissionNode = this.queue.poll();
-        if (permissionNode != null) {
+    public void tick(int batchSize) {
+        for (int i = 0; i < batchSize; i++) {
+            String permissionNode = this.queue.poll();
+            if (permissionNode == null) break;
             addPermission(permissionNode);
         }
     }
diff --git a/Core/src/main/java/nl/svenar/powerranks/common/structure/PRPlayerRank.java b/Core/src/main/java/nl/svenar/powerranks/common/structure/PRPlayerRank.java
index 9f8a3cf..1ed863b 100644
--- a/Core/src/main/java/nl/svenar/powerranks/common/structure/PRPlayerRank.java
+++ b/Core/src/main/java/nl/svenar/powerranks/common/structure/PRPlayerRank.java
@@ -72,7 +72,7 @@ public void addTag(String tagName, Object tagValue) {
         if (tagName.equalsIgnoreCase("expires")) {
             long currentTimeMillis = System.currentTimeMillis();
             tagValue = PRUtil.timeStringToSecondsConverter(String.valueOf(tagValue));
-            tagValue = currentTimeMillis + ((int) tagValue * 1000);
+            tagValue = currentTimeMillis + ((int) tagValue * 1000L);
         }
 
         if (tagName.equalsIgnoreCase("world")) {