diff --git a/src/linux/window_manager/linux_window_manager.h b/src/linux/window_manager/linux_window_manager.h
index 80b5da01..7ee9ddb4 100644
--- a/src/linux/window_manager/linux_window_manager.h
+++ b/src/linux/window_manager/linux_window_manager.h
@@ -1,8 +1,8 @@
 // Copyright (c) Epic Games Tools
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
-#ifndef OS_GFX_LINUX_H
-#define OS_GFX_LINUX_H
+#ifndef LINUX_WINDOW_MANAGER_H
+#define LINUX_WINDOW_MANAGER_H
 
 ////////////////////////////////
 //~ rjf: Includes
@@ -58,4 +58,4 @@ global LNX_WM_GfxState *os_lnx_gfx_state = 0;
 
 internal LNX_WM_Window *os_lnx_window_from_x11window(Window window);
 
-#endif // OS_GFX_LINUX_H
+#endif // LINUX_WINDOW_MANAGER_H
diff --git a/src/raddbg/raddbg_main.c b/src/raddbg/raddbg_main.c
index b3da3aef..46b59b94 100644
--- a/src/raddbg/raddbg_main.c
+++ b/src/raddbg/raddbg_main.c
@@ -11,6 +11,7 @@
 //  [ ] type views for `MyByte *` example do not match correctly
 //
 // [ ] many threads hitting conditional breakpoints -> causes 0x8000003 exception!
+// [ ] string conditional breakpoints -> size != 0 check seems to fail, can test w/ "rd_init" subprogram type gen in d2r2
 //
 //- evaluation space coverage pass
 // [ ] eval space reads/writes -> needs staleness/badness info - replace ctrl layer, to apply to all spaces
diff --git a/src/rdi_from_dwarf/rdi_from_dwarf_2.c b/src/rdi_from_dwarf/rdi_from_dwarf_2.c
index 4e4cda17..baad683a 100644
--- a/src/rdi_from_dwarf/rdi_from_dwarf_2.c
+++ b/src/rdi_from_dwarf/rdi_from_dwarf_2.c
@@ -3381,7 +3381,7 @@ d2r2_convert(Arena *arena, D2R2_ConvertParams *params)
           //- rjf: unpack type
           //
           RDIM_Type *type = 0;
-          if(type_attrib != &dw2_attrib_nil)
+          if(type_attrib != &dw2_attrib_nil || tag.kind == DW_TagKind_SubProgram)
           {
             // rjf: functions need to get their type info from themselves; the type attrib
             // only references the return type. so, in that case, we'll use the procedure's
diff --git a/src/render/opengl/linux/render_opengl_linux.h b/src/render/opengl/linux/render_opengl_linux.h
index 823e104e..3cab3328 100644
--- a/src/render/opengl/linux/render_opengl_linux.h
+++ b/src/render/opengl/linux/render_opengl_linux.h
@@ -14,7 +14,7 @@
 //~ rjf: Decide On Backend
 
 #if !defined(R_OPENGL_LINUX_BACKEND)
-# define R_OPENGL_LINUX_BACKEND R_OPENGL_LINUX_BACKEND_EGL
+# define R_OPENGL_LINUX_BACKEND R_OPENGL_LINUX_BACKEND_GLX
 #endif
 
 ////////////////////////////////