diff --git a/artifacts/scripting/headers/define_extra.h b/artifacts/scripting/headers/define_extra.h
index 6b5b260b..2de1909c 100644
--- a/artifacts/scripting/headers/define_extra.h
+++ b/artifacts/scripting/headers/define_extra.h
@@ -120,7 +120,7 @@
 #define RMOBJ_RM_MULT_OBJS        4563866
 #define RMOBJ_REPLACE_WEAPON      4658526
 #define RMOBJ_THROW               4266040
-#define RMOBJ_SUB_CONTAINER       4683191  // search and remove the item from a container inside of an inventory
+#define RMOBJ_SUB_CONTAINER       4683191  // search and remove the item from nested containers in the inventory
 
 // common prototype offsets for get/set_proto_data
 #define PROTO_PID             (1)
diff --git a/sfall/FalloutEngine/Structs.h b/sfall/FalloutEngine/Structs.h
index e46e76d1..0fec931c 100644
--- a/sfall/FalloutEngine/Structs.h
+++ b/sfall/FalloutEngine/Structs.h
@@ -199,17 +199,18 @@ struct ScriptInstance {
 struct Program {
 	const char* fileName;
 	long *codeStackPtr;
-	char gap_8[8];
+	long gap_8;
+	long gap_9;
 	long *codePtr;
 	long field_14;
-	char gap_18[4];
+	long gap_18;
 	long *dStackPtr;
 	long *aStackPtr;
 	long *dStackOffs;
 	long *aStackOffs;
-	char gap_2C[4];
+	long gap_2C;
 	long *stringRefPtr;
-	char gap_34[4];
+	long gap_34;
 	long *procTablePtr;
 };
 
diff --git a/sfall/Modules/HookScripts.cpp b/sfall/Modules/HookScripts.cpp
index 5db44621..3bf3ebed 100644
--- a/sfall/Modules/HookScripts.cpp
+++ b/sfall/Modules/HookScripts.cpp
@@ -263,7 +263,7 @@ void HookScripts::init() {
 	LoadGameHook::OnAfterGameStarted() += SourceUseSkillOnInit;
 
 	HookScripts::injectAllHooks = isDebug && (iniGetInt("Debugging", "InjectAllGameHooks", 0, ::sfall::ddrawIni) != 0);
-	if (HookScripts::injectAllHooks) dlogr("Injecting all game hooks", DL_HOOK);
+	if (HookScripts::injectAllHooks) dlogr("Injecting all game hooks", DL_HOOK|DL_INIT);
 }
 
 }
diff --git a/sfall/ddraw.vcxproj b/sfall/ddraw.vcxproj
index f277febc..1e57417e 100644
--- a/sfall/ddraw.vcxproj
+++ b/sfall/ddraw.vcxproj
@@ -86,7 +86,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>INITGUID;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -96,6 +96,7 @@
       <ForcedIncludeFiles>stdafx.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(DXSDK_DIR)Include\</AdditionalIncludeDirectories>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <Link>
       <AdditionalDependencies>d3d9.lib;d3dx9.lib;dinput.lib;Strmiids.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>