diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4e2a14c..c51b0f8d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,12 +1,6 @@
 name: Build
 
-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]
 
 jobs:
   build-linux-i386:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3a99a7f2..4974855e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,12 +1,6 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]
 
 jobs:
   tests-linux-i386:
diff --git a/dedicated/sys_ded.cpp b/dedicated/sys_ded.cpp
index c7a9be92..f1ff4449 100644
--- a/dedicated/sys_ded.cpp
+++ b/dedicated/sys_ded.cpp
@@ -470,7 +470,7 @@ bool CDedicatedSteamApplication::Create( )
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 {
-#ifndef POSIX
+#if !defined( POSIX ) && !defined( PLATFORM_64BITS )
 	_asm
 	{
 		fninit
diff --git a/wscript b/wscript
index 5c12bf40..c2f86949 100644
--- a/wscript
+++ b/wscript
@@ -394,7 +394,8 @@ def configure(conf):
 			'/Zc:forScope',
 			'/Zc:wchar_t',
 			'/GR',
-			'/TP'
+			'/TP',
+			'/EHsc'
 		]
 		
 		if conf.options.BUILD_TYPE == 'debug':