diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index fc99ba3970b..6e1517837d8 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -846,8 +846,11 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 			script.eventRegistry().events(ScriptUnloadEvent.class)
 					.forEach(event -> event.onUnload(parser, script));
 
-			for (Structure structure : script.getStructures())
-				structure.unload();
+			Stream<Structure> structuresStream = script.getStructures().stream();
+			if (isParallel())
+				structuresStream = structuresStream.parallel();
+
+			structuresStream.forEachOrdered(Structure::unload);
 		}
 
 		parser.setInactive();
diff --git a/src/main/java/ch/njol/skript/command/ScriptCommand.java b/src/main/java/ch/njol/skript/command/ScriptCommand.java
index 48d6c01dbbc..f9cb1784d24 100644
--- a/src/main/java/ch/njol/skript/command/ScriptCommand.java
+++ b/src/main/java/ch/njol/skript/command/ScriptCommand.java
@@ -19,6 +19,7 @@
 import ch.njol.skript.log.Verbosity;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.EmptyStacktraceException;
+import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.chat.BungeeConverter;
@@ -459,21 +460,24 @@ public void registerHelp() {
 	}
 
 	public void unregisterHelp() {
-		Bukkit.getHelpMap().getHelpTopics().removeAll(helps);
-		final HelpTopic aliases = Bukkit.getHelpMap().getHelpTopic("Aliases");
-		if (aliases != null && aliases instanceof IndexHelpTopic) {
-			try {
-				final Field topics = IndexHelpTopic.class.getDeclaredField("allTopics");
-				topics.setAccessible(true);
-				@SuppressWarnings("unchecked")
-				final ArrayList<HelpTopic> as = new ArrayList<>((Collection<HelpTopic>) topics.get(aliases));
-				as.removeAll(helps);
-				topics.set(aliases, as);
-			} catch (final Exception e) {
-				Skript.outdatedError(e);//, "error unregistering aliases for /" + getName());
+		Task.callSync(() -> {
+			Bukkit.getHelpMap().getHelpTopics().removeAll(helps);
+			final HelpTopic aliases = Bukkit.getHelpMap().getHelpTopic("Aliases");
+			if (aliases != null && aliases instanceof IndexHelpTopic) {
+				try {
+					final Field topics = IndexHelpTopic.class.getDeclaredField("allTopics");
+					topics.setAccessible(true);
+					@SuppressWarnings("unchecked")
+					final ArrayList<HelpTopic> as = new ArrayList<>((Collection<HelpTopic>) topics.get(aliases));
+					as.removeAll(helps);
+					topics.set(aliases, as);
+				} catch (final Exception e) {
+					Skript.outdatedError(e);//, "error unregistering aliases for /" + getName());
+				}
 			}
-		}
-		helps.clear();
+			helps.clear();
+			return null;
+		});
 	}
 
 	public String getName() {