diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h
index ea79255cc..6acec6951 100644
--- a/include/JSystem/JGadget/linklist.h
+++ b/include/JSystem/JGadget/linklist.h
@@ -63,9 +63,9 @@ struct TNodeLinkList {
     }
 
     iterator begin() { return iterator(ocObject_.getNext()); }
-    iterator end() { return iterator(ocObject_.getPrev()); }
     const_iterator begin() const { return const_iterator(ocObject_.getNext()); }
-    const_iterator end() const { return const_iterator(ocObject_.getPrev()); }
+    iterator end() { return iterator(&ocObject_); }
+    const_iterator end() const { return const_iterator((TLinkListNode*)(&ocObject_)); }
     u32 size() { return count; }
 
     iterator erase(JGadget::TNodeLinkList::iterator, JGadget::TNodeLinkList::iterator);
@@ -122,29 +122,13 @@ struct TLinkList : public TNodeLinkList {
         /* 0x00 */ TNodeLinkList::const_iterator base;
     };
 
-    iterator Insert(iterator iter, T* element) {
-        return TNodeLinkList::Insert(iter.base, Element_toNode(element));
-    }
+    iterator Insert(iterator iter, T* element) { return TNodeLinkList::Insert(iter.base, Element_toNode(element)); }
+    iterator Erase(T* element) { return TNodeLinkList::Erase(Element_toNode(element)); }
 
-    iterator Erase(T* element) {
-        return TNodeLinkList::Erase(Element_toNode(element));
-    }
-
-    iterator begin() {
-        return iterator(TNodeLinkList::begin());
-    }
-
-    iterator end() {
-        return iterator(TNodeLinkList::end());
-    }
-
-    const_iterator begin() const {
-        return const_iterator(TNodeLinkList::begin());
-    }
-
-    const_iterator end() const {
-        return const_iterator(TNodeLinkList::end());
-    }
+    iterator begin() { return iterator(TNodeLinkList::begin()); }
+    const_iterator begin() const { return const_iterator(TNodeLinkList::begin()); }
+    iterator end() { return iterator(TNodeLinkList::end()); }
+    const_iterator end() const { return const_iterator(TNodeLinkList::end()); }
 
     void Push_back(T* element) {
         Insert(end(), element);
diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index f43d6ba06..fdb994cdd 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -362,6 +362,10 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
     return manager;
 }
 
+static void dummy3() {
+    OSReport("consoleManager != 0 && sManager == consoleManager");
+}
+
 /* 802CB380-802CB4C4       .text appendConsole__17JUTConsoleManagerFP10JUTConsole */
 void JUTConsoleManager::appendConsole(JUTConsole* console) {
     /* Nonmatching */
@@ -403,9 +407,7 @@ void JUTConsoleManager::draw() const {
     /* Nonmatching */
 
     // need to figure out how TLinkList works
-    ConsoleList::const_iterator iter = soLink_.begin();
-    ConsoleList::const_iterator end = soLink_.end();
-    for (; iter != end; ++iter) {
+    for (ConsoleList::const_iterator iter = soLink_.begin(); iter != soLink_.end(); ++iter) {
         JUTConsole* pConsole = &(*iter);
         if (pConsole != mActiveConsole)
             pConsole->doDraw(JUTConsole::INACTIVE);