diff --git a/src/main/java/com/replaymod/core/utils/WrappedTimer.java b/src/main/java/com/replaymod/core/utils/WrappedTimer.java
index 9d664035..929f0097 100644
--- a/src/main/java/com/replaymod/core/utils/WrappedTimer.java
+++ b/src/main/java/com/replaymod/core/utils/WrappedTimer.java
@@ -38,7 +38,7 @@ public class WrappedTimer extends Timer {
         to.lastSyncSysClock = from.lastSyncSysClock;
         to.elapsedPartialTicks = from.elapsedPartialTicks;
         //#if MC>=11200
-        // FIXME (should be good to go once AT are applied) to.tickLength = from.tickLength;
+        to.tickLength = from.tickLength;
         //#else
         //$$ to.ticksPerSecond = from.ticksPerSecond;
         //$$ to.lastHRTime = from.lastHRTime;
diff --git a/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java b/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java
index e794e272..c6c761a4 100644
--- a/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java
+++ b/src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java
@@ -28,8 +28,8 @@ import de.johni0702.minecraft.gui.layout.VerticalLayout;
 import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
 import de.johni0702.minecraft.gui.utils.Colors;
 import de.johni0702.minecraft.gui.utils.Consumer;
-import org.lwjgl.util.Dimension;
-import org.lwjgl.util.ReadableDimension;
+import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
+import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java b/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java
index 4d586132..98a8a92f 100644
--- a/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java
+++ b/src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java
@@ -14,7 +14,11 @@ import com.replaymod.replaystudio.pathing.path.Timeline;
 import net.minecraft.client.Minecraft;
 
 //#if MC>=10800
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//#if MC>=11300
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+//#else
+//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//#endif
 //#else
 //$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 //#endif
@@ -28,7 +32,7 @@ import static com.replaymod.core.versions.MCVer.*;
  * Plays a timeline.
  */
 public abstract class AbstractTimelinePlayer {
-    private final Minecraft mc = Minecraft.getMinecraft();
+    private final Minecraft mc = getMinecraft();
     private final ReplayHandler replayHandler;
     private Timeline timeline;
     protected long startOffset;
diff --git a/src/main/java/com/replaymod/pathing/player/ReplayTimer.java b/src/main/java/com/replaymod/pathing/player/ReplayTimer.java
index a2bdc331..597fe805 100644
--- a/src/main/java/com/replaymod/pathing/player/ReplayTimer.java
+++ b/src/main/java/com/replaymod/pathing/player/ReplayTimer.java
@@ -4,7 +4,11 @@ import com.replaymod.core.utils.WrappedTimer;
 import net.minecraft.util.Timer;
 
 //#if MC>=10800
-import net.minecraftforge.fml.common.eventhandler.Event;
+//#if MC>=11300
+import net.minecraftforge.eventbus.api.Event;
+//#else
+//$$ import net.minecraftforge.fml.common.eventhandler.Event;
+//#endif
 //#else
 //$$ import cpw.mods.fml.common.eventhandler.Event;
 //#endif
@@ -15,16 +19,28 @@ import static com.replaymod.core.versions.MCVer.*;
  * Wrapper around the current timer that prevents the timer from advancing by itself.
  */
 public class ReplayTimer extends WrappedTimer {
-    private final Timer state = new Timer(0);
+    //#if MC>=11300
+    private final Timer state = new Timer(0, 0);
+    //#else
+    //$$ private final Timer state = new Timer(0);
+    //#endif
 
     public ReplayTimer(Timer wrapped) {
         super(wrapped);
     }
 
     @Override
-    public void updateTimer() {
+    public void updateTimer(
+            //#if MC>=11300
+            long sysClock
+            //#endif
+    ) {
         copy(this, state); // Save our current state
-        super.updateTimer(); // Update current state
+        wrapped.updateTimer(
+                //#if MC>=11300
+                sysClock
+                //#endif
+        ); // Update current state
         copy(state, this); // Restore our old state
         FML_BUS.post(new UpdatedEvent());
     }
diff --git a/versions/common.gradle b/versions/common.gradle
index 65dd4254..f5756395 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -277,7 +277,6 @@ sourceSets {
             exclude 'com/replaymod/editor'
             exclude 'com/replaymod/extras'
             exclude 'com/replaymod/online'
-            exclude 'com/replaymod/pathing'
             exclude 'com/replaymod/render'
             exclude 'com/replaymod/restrictions'
             exclude 'com/replaymod/simplepathing'