diff --git a/include/midi.hpp b/include/midi.hpp
index 20f2cb1..7c2135e 100644
--- a/include/midi.hpp
+++ b/include/midi.hpp
@@ -29,6 +29,8 @@
 
 #include "choc/choc_SmallVector.h"
 
+#include <jansson.h>
+
 namespace rack {
 /** Abstraction for all MIDI drivers in Rack */
 namespace midi {
diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp
index 003438a..a26e5c9 100644
--- a/src/CardinalCommon.cpp
+++ b/src/CardinalCommon.cpp
@@ -279,11 +279,11 @@ struct InputQueue::Internal {
 };
 
 InputQueue::InputQueue() {
-	internal = new Internal;
+    internal = new Internal;
 }
 
 InputQueue::~InputQueue() {
-	delete internal;
+    delete internal;
 }
 
 bool InputQueue::tryPop(Message* const messageOut, int64_t maxFrame)
@@ -293,11 +293,11 @@ bool InputQueue::tryPop(Message* const messageOut, int64_t maxFrame)
 
     if (processCounterChanged)
     {
-        internal->lastBlockFrame = pcontext->engine->getBlockFrame();
+        internal->lastBlockFrame = internal->pcontext->engine->getBlockFrame();
         internal->lastProcessCounter = processCounter;
 
-        internal->midiEvents = pcontext->midiEvents;
-        internal->midiEventsLeft = pcontext->midiEventCount;
+        internal->midiEvents = internal->pcontext->midiEvents;
+        internal->midiEventsLeft = internal->pcontext->midiEventCount;
     }
 
     if (internal->midiEventsLeft == 0 || maxFrame < internal->lastBlockFrame)