diff --git a/modules/runtime b/modules/runtime
index 3db2ebf..de0c8a5 160000
--- a/modules/runtime
+++ b/modules/runtime
@@ -1 +1 @@
-Subproject commit 3db2ebfcfa2b5c7074a7e513a56a39f07f6ce6c0
+Subproject commit de0c8a5500e90f1b63b038bcf7b40dc577529be2
diff --git a/src/Wasi.Sdk/Wasi.Sdk.csproj b/src/Wasi.Sdk/Wasi.Sdk.csproj
index 287ee9b..63ca110 100644
--- a/src/Wasi.Sdk/Wasi.Sdk.csproj
+++ b/src/Wasi.Sdk/Wasi.Sdk.csproj
@@ -33,8 +33,8 @@
 		-->
 		<PropertyGroup>
 			<_WasiRuntimeArtifactsBin>..\..\modules\runtime\artifacts\bin\</_WasiRuntimeArtifactsBin>
-			<_WasiRuntimeArtifactsNativeRoot>$(_WasiRuntimeArtifactsBin)mono\Wasi.Release\</_WasiRuntimeArtifactsNativeRoot>
-			<_WasiRuntimeArtifactsBrowserWasmRoot>$(_WasiRuntimeArtifactsBin)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\</_WasiRuntimeArtifactsBrowserWasmRoot>
+			<_WasiRuntimeArtifactsNativeRoot>$(_WasiRuntimeArtifactsBin)mono\Wasi.$(Configuration)\</_WasiRuntimeArtifactsNativeRoot>
+			<_WasiRuntimeArtifactsBrowserWasmRoot>$(_WasiRuntimeArtifactsBin)microsoft.netcore.app.runtime.browser-wasm\$(Configuration)\runtimes\browser-wasm\</_WasiRuntimeArtifactsBrowserWasmRoot>
 		</PropertyGroup>
 		<ItemGroup>
 			<_WasiPackLibFiles Include="$(_WasiRuntimeArtifactsBrowserWasmRoot)lib\**\*.dll" />
diff --git a/src/Wasi.Sdk/build/Wasi.Sdk.targets b/src/Wasi.Sdk/build/Wasi.Sdk.targets
index 76e6d0b..ebd88f2 100644
--- a/src/Wasi.Sdk/build/Wasi.Sdk.targets
+++ b/src/Wasi.Sdk/build/Wasi.Sdk.targets
@@ -53,7 +53,6 @@
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-wasi-driver.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmonosgen-2.0.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-hot_reload-stub-static.a" />
-		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-marshal-ilgen-stub-static.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-diagnostics_tracing-stub-static.a" />
 		<WasiNativeFileReference Condition="'$(WaitForDebugger)' == 'true'" Include="$(WasiRuntimePackRoot)native\libmono-component-debugger-static.a" />
 		<WasiNativeFileReference Condition="'$(WaitForDebugger)' != 'true'" Include="$(WasiRuntimePackRoot)native\libmono-component-debugger-stub-static.a" />
@@ -214,7 +213,7 @@
 			<WasiSdkClangArgs>$(WasiSdkClangArgs) -I"$(WasiRuntimePackRoot)\native\include"</WasiSdkClangArgs>
 			<WasiSdkClangArgs>$(WasiSdkClangArgs) -Wl,--export=malloc,--export=free,--export=__heap_base,--export=__data_end</WasiSdkClangArgs>
 			<WasiSdkClangArgs>$(WasiSdkClangArgs) -Wl,-z,stack-size=1048576,--initial-memory=52428800,--max-memory=524288000,-lwasi-emulated-mman</WasiSdkClangArgs>
-			<WasiSdkClangArgs>$(WasiSdkClangArgs) -Wl,-s</WasiSdkClangArgs> <!-- Strip debug symbols -->
+			<WasiSdkClangArgs Condition="'$(Configuration)' != 'Debug'">$(WasiSdkClangArgs) -Wl,-s</WasiSdkClangArgs> <!-- Strip debug symbols -->
 			<WasiSdkClangArgs Condition="'@(WasiAfterRuntimeLoadedDeclarations)' != ''">$(WasiSdkClangArgs) -D WASI_AFTER_RUNTIME_LOADED_DECLARATIONS=&quot;@(WasiAfterRuntimeLoadedDeclarations, ' ')&quot;</WasiSdkClangArgs>
 			<WasiSdkClangArgs Condition="'@(WasiAfterRuntimeLoadedCalls)' != ''">$(WasiSdkClangArgs) -D WASI_AFTER_RUNTIME_LOADED_CALLS=&quot;@(WasiAfterRuntimeLoadedCalls, ' ')&quot;</WasiSdkClangArgs>
 			<WasiSdkClangArgs>$(WasiSdkClangArgs) -o &quot;$(WasmOutputIntermediateFile)&quot;</WasiSdkClangArgs>
diff --git a/src/Wasi.Sdk/native/main.c b/src/Wasi.Sdk/native/main.c
index aff3a44..b4c01b9 100644
--- a/src/Wasi.Sdk/native/main.c
+++ b/src/Wasi.Sdk/native/main.c
@@ -9,9 +9,6 @@ const char* dotnet_wasi_getentrypointassemblyname();
 const char* dotnet_wasi_getbundledfile(const char* name, int* out_length);
 void dotnet_wasi_registerbundledassemblies();
 
-// TODO: This should actually go in driver.c in the runtime
-void mono_marshal_ilgen_init() {}
-
 #ifdef WASI_AFTER_RUNTIME_LOADED_DECLARATIONS
 // This is supplied from the MSBuild itemgroup @(WasiAfterRuntimeLoaded)
 WASI_AFTER_RUNTIME_LOADED_DECLARATIONS