diff --git a/libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h
index 108d6f60f1..da03389c25 100644
--- a/libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h
+++ b/libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h
@@ -64,9 +64,9 @@ struct data {
     };
 
     struct TBlockData {
-        u32 size;
-        u16 scheme;
-        u16 IDSize;
+        BE(u32) size;
+        BE(u16) scheme;
+        BE(u16) IDSize;
         u32 field_0x8[0];
     };
 
diff --git a/libs/JSystem/src/JStudio/JStudio/ctb.cpp b/libs/JSystem/src/JStudio/JStudio/ctb.cpp
index 9a371ea936..61046ad35c 100644
--- a/libs/JSystem/src/JStudio/JStudio/ctb.cpp
+++ b/libs/JSystem/src/JStudio/JStudio/ctb.cpp
@@ -68,7 +68,7 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
 JStudio::ctb::TFactory::~TFactory() {}
 
 JStudio::ctb::TObject* JStudio::ctb::TFactory::create(JStudio::ctb::data::TParse_TBlock const& param_0) {
-    switch(BSWAP16(param_0.get_scheme())) {
+    switch(param_0.get_scheme()) {
     case 1:
         return JKR_NEW TObject_TxyzRy(param_0);
     default:
diff --git a/libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp
index ff192835b3..18eab0832b 100644
--- a/libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp
+++ b/libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp
@@ -49,7 +49,7 @@ int JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, f32 p
 int JStudio::TControl::transform_setOrigin_ctb(JStudio::ctb::TObject const& param_0) {
     switch (param_0.getScheme()) {
     case 1: {
-        const f32* pfVar4 = (const f32*)param_0.getData();
+        const BE(f32)* pfVar4 = (const BE(f32)*)param_0.getData();
         Vec local_144 = {0.0f, 0.0f, 0.0f};
         local_144.x = pfVar4[0];
         local_144.y = pfVar4[1];