diff --git a/.travis.yml b/.travis.yml
index cc10c23fb404b546a7c3bb0a76c1c224443cdff6..e54677ac4a4d14319b010d5c663a66d7c529205e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -188,6 +188,9 @@ matrix:
           osx_image: xcode7.3
           #Apple LLVM version 7.3.0 (clang-703.0.31)
     allow_failures:
+      - compiler: clang-3.5
+      - compiler: clang-3.6
+      - compiler: clang-3.7
       - compiler: clang-3.8
 
 cache:
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index ab7631bc6000aec3e576f5728ec9f38e9fe28492..25fccb9f921a7fc4087e58769c7903e74eaaaaf8 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -214,12 +214,14 @@ int main(int argc, char **argv)
 #if defined (_WIN32) && !defined (_XBOX)
 #ifndef _WIN32_WCE
 	{
+#if 0 // just load the DLL
 		p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsDebuggerPresent");
 		if ((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
 #ifdef BUGTRAP
 			&& !InitBugTrap()
 #endif
 			)
+#endif
 		{
 			LoadLibraryA("exchndl.dll");
 		}
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 9c9a20e75cfc00127a28b150c98afc1ee344009c..663eddbd443d7b3e5f7a2fffc09b74e2c4e6a508 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -644,13 +644,16 @@ int WINAPI WinMain (HINSTANCE hInstance,
 {
 	int Result = -1;
 
+#if 0
 	// Win95 and NT <4 don't have this, so link at runtime.
 	p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
+#endif
 
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
 	UNREFERENCED_PARAMETER(nCmdShow);
 
+#if 0
 #ifdef BUGTRAP
 	// Try BugTrap first.
 	if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) && InitBugTrap())
@@ -660,6 +663,7 @@ int WINAPI WinMain (HINSTANCE hInstance,
 #endif
 		// Try Dr MinGW's exception handler.
 		if (!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
+#endif
 			LoadLibraryA("exchndl.dll");
 
 		prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);