diff --git a/FDK/src/01.Framework/Rendering/Angle/AngleContext.cs b/FDK/src/01.Framework/Rendering/Angle/AngleContext.cs
index 6c61bb55..4b20461d 100644
--- a/FDK/src/01.Framework/Rendering/Angle/AngleContext.cs
+++ b/FDK/src/01.Framework/Rendering/Angle/AngleContext.cs
@@ -24,7 +24,9 @@ public class AngleContext : IGLContext
         else if (window.Native.Kind.HasFlag(NativeWindowFlags.X11))
         {
             windowHandle = (nint)window.Native.X11.Value.Window;
-            display = Egl.GetDisplay(window.Native.X11.Value.Display);
+            // Temporary fix for the segfaults
+            // Note than X11 Display number is NOT always 0, it can be 1, 2 and so on for example in cases of user switching
+            display = 0;// Egl.GetDisplay(window.Native.X11.Value.Display);
         }
         else if (window.Native.Kind.HasFlag(NativeWindowFlags.Cocoa))
         {
diff --git a/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs b/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs
index 77032249..0f856cf5 100644
--- a/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs
+++ b/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs
@@ -48,7 +48,7 @@ namespace TJAPlayer3
         public static string EFFECTS = @$"10_Effects{Path.DirectorySeparatorChar}";
         public static string BALLOON = @$"11_Balloon{Path.DirectorySeparatorChar}";
         public static string LANE = @$"12_Lane{Path.DirectorySeparatorChar}";
-        public static string GENRE = @$"13_Genre{Path.DirectorySeparatorChar}";
+        public static string GENRE = @$"13_GENRE{Path.DirectorySeparatorChar}";
         public static string GAMEMODE = @$"14_GameMode{Path.DirectorySeparatorChar}";
         public static string FAILED = @$"15_Failed{Path.DirectorySeparatorChar}";
         public static string RUNNER = @$"16_Runner{Path.DirectorySeparatorChar}";