diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59e4fba..e813e26 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,6 @@ jobs:
           case ${{ matrix.platform.name }} in
             msdos*)
               echo CC=wcl386 >> $GITHUB_ENV
-              echo AR=wlib >> $GITHUB_ENV
               echo "INCLUDE=$WATCOM/h" >> $GITHUB_ENV
               echo "LIB=$WATCOM/lib386" >> $GITHUB_ENV
               echo "PATH=$WATCOM/binl:$WATCOM/binw:$PATH" >> $GITHUB_ENV
diff --git a/Makefile b/Makefile
index 0591776..793f937 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,10 @@ INSTALLDIR ?= /usr/local/bin
 
 # Detect Watcom compiler
 ifneq (,$(findstring wc,$(firstword $(CC))))
-	CFLAGS = -d0 -ox -za99 -zq -c -i="$(CURDIR)/include" -fo=
+	CFLAGS = -d0 -ox -zastd=c99 -aa -zq -c -i="$(CURDIR)/include" -fo=
 	LDFLAGS = -zq -l=pmodew -fe=
-	ARFLAGS =
+	AR = wlib
+	ARFLAGS = -q
 	EXESUFFIX = .exe
 	LIBSUFFIX = .lib
 # Detect Mingw compiler
diff --git a/src/lib/stunpack.c b/src/lib/stunpack.c
index 173ac4a..48e1948 100644
--- a/src/lib/stunpack.c
+++ b/src/lib/stunpack.c
@@ -62,8 +62,13 @@ const char *stpk_versionStr(stpk_Version version)
 
 stpk_Context stpk_init(stpk_Version version, int maxPasses, int verbosity, stpk_LogCallback logCallback, stpk_AllocCallback allocCallback, stpk_DeallocCallback deallocCallback)
 {
-	stpk_Buffer empty = { NULL, 0, 0 };
+	stpk_Buffer empty = {
+		.data = NULL,
+		.offset = 0,
+		.len = 0
+	};
 
+	// Open Watcom does not support designated initializers with struct values (2024-01-06)
 	stpk_Context ctx;
 	ctx.src = empty;
 	ctx.dst = empty;