diff --git a/CHANGELOG.md b/CHANGELOG.md
index b57196d3..cb481d97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,9 @@ Enum++ & Full Remapper
     -   Note: the remapping file now uses a new storage format, that will make Rhizo jar bigger.
     -   It has been 4 months since the first attempt of bringing remapper to 1.16, and it turns out the first 3 months are completely useless, because writing a new Remapper solution from the ground up is actually faster.
 -   Rhizo will now provide a dummy mod with modid `rhizo`
--   Rhizo now includes a nod icon
+-   Rhizo now includes a mod icon
+
+---
 
 ## Rhizo 2.1 -> 2.2
 
@@ -20,6 +22,8 @@ Early Remapper
 
 -   Remapper is now enabled before KubeJS startup script is loaded, so that names used in startup scripts can also be remapped.
 
+---
+
 ## Rhizo 2.0 -> 2.1
 
 Compiler Mode
@@ -33,6 +37,8 @@ Compiler Mode
     -   generated mapping file is designed for a more complex remapper implementation, and is scheduled to be available in the next release
 -   mapping file used by our temporary remapper solution is now driven by `.csv` file, for readablility.
 
+---
+
 ## Rhino 1605.1.9 -> Rhizo 1605.2.0
 
 First release
diff --git a/common/src/main/java/dev/latvian/mods/rhino/ScriptRuntime.java b/common/src/main/java/dev/latvian/mods/rhino/ScriptRuntime.java
index e3740701..ab839c73 100644
--- a/common/src/main/java/dev/latvian/mods/rhino/ScriptRuntime.java
+++ b/common/src/main/java/dev/latvian/mods/rhino/ScriptRuntime.java
@@ -96,9 +96,18 @@ public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] ar
 	 * that they won't cause problems by being loaded early.
 	 */
 
-	public final static Class<?> BooleanClass = Kit.classOrNull("java.lang.Boolean"), ByteClass = Kit.classOrNull("java.lang.Byte"), CharacterClass = Kit.classOrNull("java.lang.Character"), ClassClass = Kit.classOrNull("java.lang.Class"), DoubleClass = Kit.classOrNull("java.lang.Double"), FloatClass = Kit.classOrNull("java.lang.Float"), IntegerClass = Kit.classOrNull("java.lang.Integer"), LongClass = Kit.classOrNull("java.lang.Long"), NumberClass = Kit.classOrNull("java.lang.Number"), ObjectClass = Kit.classOrNull("java.lang.Object"), ShortClass = Kit.classOrNull("java.lang.Short"), StringClass = Kit.classOrNull("java.lang.String"), DateClass = Kit.classOrNull("java.util.Date");
-
-	public final static Class<?> ContextClass = Kit.classOrNull("dev.latvian.mods.rhino.Context"), ContextFactoryClass = Kit.classOrNull("dev.latvian.mods.rhino.ContextFactory"), FunctionClass = Kit.classOrNull("dev.latvian.mods.rhino.Function"), ScriptableObjectClass = Kit.classOrNull("dev.latvian.mods.rhino.ScriptableObject");
+	public final static Class<?> BooleanClass = Kit.classOrNull("java.lang.Boolean"), ByteClass =
+		Kit.classOrNull("java.lang.Byte"), CharacterClass = Kit.classOrNull("java.lang.Character"), ClassClass =
+		Kit.classOrNull("java.lang.Class"), DoubleClass = Kit.classOrNull("java.lang.Double"), FloatClass =
+		Kit.classOrNull("java.lang.Float"), IntegerClass = Kit.classOrNull("java.lang.Integer"), LongClass =
+		Kit.classOrNull("java.lang.Long"), NumberClass = Kit.classOrNull("java.lang.Number"), ObjectClass =
+		Kit.classOrNull("java.lang.Object"), ShortClass = Kit.classOrNull("java.lang.Short"), StringClass =
+		Kit.classOrNull("java.lang.String"), DateClass = Kit.classOrNull("java.util.Date");
+
+	public final static Class<?> ContextClass = Kit.classOrNull("dev.latvian.mods.rhino.Context"), ContextFactoryClass =
+		Kit.classOrNull("dev.latvian.mods.rhino.ContextFactory"), FunctionClass =
+		Kit.classOrNull("dev.latvian.mods.rhino.Function"), ScriptableObjectClass =
+		Kit.classOrNull("dev.latvian.mods.rhino.ScriptableObject");
 	public static final Class<Scriptable> ScriptableClass = Scriptable.class;
 
 	private static final Object LIBRARY_SCOPE_KEY = "LIBRARY_SCOPE";
@@ -156,20 +165,6 @@ public static ScriptableObject initSafeStandardObjects(Context cx, ScriptableObj
 		new LazilyLoadedCtor(scope, "RegExp", "dev.latvian.mods.rhino.regexp.NativeRegExp", sealed, true);
 		new LazilyLoadedCtor(scope, "Continuation", "dev.latvian.mods.rhino.NativeContinuation", sealed, true);
 
-		if (cx.hasFeature(Context.FEATURE_V8_EXTENSIONS)) {
-			new LazilyLoadedCtor(scope, "ArrayBuffer", "dev.latvian.mods.rhino.typedarrays.NativeArrayBuffer", sealed, true);
-			new LazilyLoadedCtor(scope, "Int8Array", "dev.latvian.mods.rhino.typedarrays.NativeInt8Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Uint8Array", "dev.latvian.mods.rhino.typedarrays.NativeUint8Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Uint8ClampedArray", "dev.latvian.mods.rhino.typedarrays.NativeUint8ClampedArray", sealed, true);
-			new LazilyLoadedCtor(scope, "Int16Array", "dev.latvian.mods.rhino.typedarrays.NativeInt16Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Uint16Array", "dev.latvian.mods.rhino.typedarrays.NativeUint16Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Int32Array", "dev.latvian.mods.rhino.typedarrays.NativeInt32Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Uint32Array", "dev.latvian.mods.rhino.typedarrays.NativeUint32Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Float32Array", "dev.latvian.mods.rhino.typedarrays.NativeFloat32Array", sealed, true);
-			new LazilyLoadedCtor(scope, "Float64Array", "dev.latvian.mods.rhino.typedarrays.NativeFloat64Array", sealed, true);
-			new LazilyLoadedCtor(scope, "DataView", "dev.latvian.mods.rhino.typedarrays.NativeDataView", sealed, true);
-		}
-
 		NativeSymbol.init(cx, scope, sealed);
 		NativeCollectionIterator.init(scope, NativeSet.ITERATOR_TAG, sealed);
 		NativeCollectionIterator.init(scope, NativeMap.ITERATOR_TAG, sealed);