diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 119c9f97..a6d0f9b1 100644
Binary files a/artifacts/mods/gl_highlighting.int and b/artifacts/mods/gl_highlighting.int differ
diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index a67414ee..45387116 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -103,6 +103,7 @@ procedure start begin
       alsoCorpse := GetConfig(configSection, "Corpses", 0);
       checkLOS := GetConfig(configSection, "CheckLOS", 0);
       outlineColor := GetConfig(configSection, "OutlineColor", 16);
+      if (outlineColor < 1) then outlineColor := 64;
       motionScanner := GetConfig(configSection, "MotionScanner", 0);
 
       highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor.");
diff --git a/sfall/Modules/Inventory.cpp b/sfall/Modules/Inventory.cpp
index a2f0917a..a0700aea 100644
--- a/sfall/Modules/Inventory.cpp
+++ b/sfall/Modules/Inventory.cpp
@@ -600,11 +600,15 @@ int __stdcall ItemCountFixStdcall(fo::GameObject* who, fo::GameObject* item) {
 
 void __declspec(naked) ItemCountFix() {
 	__asm {
-		push ebx; push ecx; push edx; // save state
+		push ebx;
+		push ecx;
+		push edx; // save state
 		push edx; // item
 		push eax; // container-object
 		call ItemCountFixStdcall;
-		pop edx; pop ecx; pop ebx; // restore
+		pop edx;
+		pop ecx;
+		pop ebx; // restore
 		retn;
 	}
 }