diff --git a/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test.cpp b/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test.cpp
index b2d0e004..9851670b 100644
--- a/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test.cpp
+++ b/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test.cpp
@@ -5,7 +5,6 @@
 #include <PSX/Periphery/periphery.hpp>
 #include <stdio.h>
 
-// TODO: All the Jabys are broken
 namespace GPUTest {
     using namespace JabyEngine;
 
diff --git a/examples/PoolBox/application/src/application.cpp b/examples/PoolBox/application/src/application.cpp
index f4ea29a3..893382e8 100644
--- a/examples/PoolBox/application/src/application.cpp
+++ b/examples/PoolBox/application/src/application.cpp
@@ -38,12 +38,11 @@ static const Menu::SimpleMenu::Entry MenuEntries[] = {
     {"Screen Center"},
 };
 
-// TODO: All elements seem to have to be Linked? Make this a rule?
 static const auto doener_fish = Make::SPRT(
     Make::AreaI16(Make::PositionI16(8, GPU::Display::Height - Assets::Main::DoenerFishInfo.size.height), Assets::Main::DoenerFishInfo.size), //         v this needs to be nicer! Has to be
     Make::OffsetPageWithClut(Assets::Main::DoenerFishInfo.tim.get_page_offset_clut4(), Make::PageClut(Assets::Main::DoenerFishInfo.tim.get_clut_position())),
     GPU::Color24::Grey()
-).linked();
+);
 
 // Do we want this namespace?
 // Do we want Paco to be HERE?!
diff --git a/src/Library/src/GPU/gpu.cpp b/src/Library/src/GPU/gpu.cpp
index 98ba7a9c..50494abe 100644
--- a/src/Library/src/GPU/gpu.cpp
+++ b/src/Library/src/GPU/gpu.cpp
@@ -64,6 +64,11 @@ namespace JabyEngine {
 
             void render(const uint32_t* data, size_t words) {
                 wait_ready_for_CMD();
+                #ifdef __SUPPORT_PS3__
+                    // The PS3 needs explict change to FiFo
+                    GPU_IO::GP1.write(GPU_IO::Command::DMADirection(GPU_IO::DMADirection::Fifo));
+                #endif // __SUPPORT_PS3__
+
                 for(size_t n = 0; n < words; n++) {
                     GPU_IO::GP0.write({data[n]});
                 }