diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index fdd5c2e2e..68042a95d 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up build environment (ubuntu-latest)
         run: |
           sudo apt-get update
-          sudo apt-get -y install ccache libao-dev libasound2-dev libevdev-dev libgl1-mesa-dev libpulse-dev libsdl2-dev libudev-dev libzip-dev libminiupnpc-dev
+          sudo apt-get -y install ccache libao-dev libasound2-dev libevdev-dev libgl1-mesa-dev libpulse-dev libsdl2-dev libudev-dev libzip-dev libminiupnpc-dev liblua5.3-dev
           echo "CCACHE_DIR=/tmp/ccache" >> $GITHUB_ENV
         if: matrix.config.os == 'ubuntu-latest'
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e943b86d1..780cf6159 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,7 +266,8 @@ if(NOT LIBRETRO)
 	if(LUA_FOUND)
 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
 	    target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source)
-	    target_link_libraries(${PROJECT_NAME} PRIVATE ${LUA_LIBRARIES})
+	    string(REPLACE ".dll" "" LUA_STATIC_LIBS ${LUA_LIBRARIES})
+	    target_link_libraries(${PROJECT_NAME} PRIVATE ${LUA_STATIC_LIBS})
 	endif()
 endif()
 
diff --git a/core/lua/lua.cpp b/core/lua/lua.cpp
index 6788f2786..6ad1d01f1 100644
--- a/core/lua/lua.cpp
+++ b/core/lua/lua.cpp
@@ -179,7 +179,6 @@ CONFIG_ACCESSORS(GGPOEnable)
 CONFIG_ACCESSORS(GGPODelay)
 CONFIG_ACCESSORS(NetworkStats)
 CONFIG_ACCESSORS(GGPOAnalogAxes)
-CONFIG_ACCESSORS(GGPOPlayerNum)
 
 // Maple devices
 
@@ -458,7 +457,6 @@ static void luaRegister(lua_State *L)
 					CONFIG_PROPERTY(GGPODelay, int)
 					CONFIG_PROPERTY(NetworkStats, bool)
 					CONFIG_PROPERTY(GGPOAnalogAxes, int)
-					CONFIG_PROPERTY(GGPOPlayerNum, int)
 				.endNamespace()
 
 				.beginNamespace("maple")
diff --git a/core/rend/dx9/dxcontext.cpp b/core/rend/dx9/dxcontext.cpp
index 00d51f59c..8180c3958 100644
--- a/core/rend/dx9/dxcontext.cpp
+++ b/core/rend/dx9/dxcontext.cpp
@@ -63,8 +63,8 @@ bool DXContext::Init(bool keepCurrentWindow)
 void DXContext::Term()
 {
 	overlay.term();
-	gui_term();
 	ImGui_ImplDX9_Shutdown();
+	gui_term();
 	pDevice.reset();
 	pD3D.reset();
 }