diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt
index ff57dd24..3ca67a90 100644
--- a/cl_dll/CMakeLists.txt
+++ b/cl_dll/CMakeLists.txt
@@ -25,7 +25,7 @@ project (CLDLL)
 
 set (CLDLL_LIBRARY client)
 
-add_definitions(-DCLIENT_WEAPONS -DCLIENT_DLL -DCROWBAR_IDLE_ANIM)
+add_definitions(-DCLIENT_WEAPONS -DCLIENT_DLL -DCROWBAR_IDLE_ANIM -DCROWBAR_FIX_RAPID_CROWBAR -DCROWBAR_DELAY_FIX)
 
 if(NOT MSVC)
 	add_compile_options(-fno-exceptions) # GCC/Clang flag
diff --git a/cl_dll/wscript b/cl_dll/wscript
index 3ada920a..fb14661d 100644
--- a/cl_dll/wscript
+++ b/cl_dll/wscript
@@ -62,5 +62,5 @@ def build(bld):
 		use      = libs,
 		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
-		idx      = 1
+		idx      = bld.get_taskgen_count()
 	)
diff --git a/common/com_model.h b/common/com_model.h
index abc8e8e6..631373fc 100644
--- a/common/com_model.h
+++ b/common/com_model.h
@@ -173,7 +173,7 @@ typedef struct mleaf_s
 
 } mleaf_t;
 
-typedef struct msurface_s
+struct msurface_s
 {
 	int		visframe;		// should be drawn when node is crossed
 
@@ -205,7 +205,7 @@ typedef struct msurface_s
 
 	color24		*samples;		// note: this is the actual lightmap data for this surface
 	decal_t		*pdecals;
-} msurface_t;
+};
 
 typedef struct msurfmesh_s
 {
diff --git a/common/mathlib.h b/common/mathlib.h
index 6bcf76eb..5a1cd0b0 100644
--- a/common/mathlib.h
+++ b/common/mathlib.h
@@ -19,14 +19,12 @@
 #include <math.h>
 
 typedef float vec_t;
-typedef vec_t vec2_t[2];
 
-#ifndef DID_VEC3_T_DEFINE
+#if !defined DID_VEC3_T_DEFINE
 #define DID_VEC3_T_DEFINE
 typedef vec_t vec3_t[3];
 #endif
 
-typedef vec_t vec4_t[4];	// x,y,z,w
 
 #ifndef M_PI
 #define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt
index 7d13d5f3..6bee15ea 100644
--- a/dlls/CMakeLists.txt
+++ b/dlls/CMakeLists.txt
@@ -25,7 +25,7 @@ project (SVDLL)
 
 set (SVDLL_LIBRARY server)
 
-add_definitions(-DCLIENT_WEAPONS -DCROWBAR_IDLE_ANIM)
+add_definitions(-DCLIENT_WEAPONS -DCROWBAR_IDLE_ANIM -DCROWBAR_FIX_RAPID_CROWBAR -DCROWBAR_DELAY_FIX)
 
 if(NOT MSVC)
 	add_compile_options(-fno-exceptions) # GCC/Clang flag
diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp
index 8a0ba9a3..acfa0674 100644
--- a/dlls/crowbar.cpp
+++ b/dlls/crowbar.cpp
@@ -287,7 +287,12 @@ int CCrowbar::Swing( int fFirst )
 				}
 				m_pPlayer->m_iWeaponVolume = CROWBAR_BODYHIT_VOLUME;
 				if( !pEntity->IsAlive() )
+				{
+#ifdef CROWBAR_FIX_RAPID_CROWBAR
+					m_flNextPrimaryAttack = GetNextAttackDelay(0.25);
+#endif
 					return TRUE;
+				}
 				else
 					flVol = 0.1;
 
@@ -330,7 +335,11 @@ int CCrowbar::Swing( int fFirst )
 		SetThink( &CCrowbar::Smack );
 		pev->nextthink = UTIL_WeaponTimeBase() + 0.2;
 #endif
+#ifdef CROWBAR_DELAY_FIX
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25;
+#else
 		m_flNextPrimaryAttack = GetNextAttackDelay( 0.25 );
+#endif
 	}
 #ifdef CROWBAR_IDLE_ANIM
 	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
diff --git a/dlls/extdll.h b/dlls/extdll.h
index 4610db5e..cded1754 100644
--- a/dlls/extdll.h
+++ b/dlls/extdll.h
@@ -51,12 +51,15 @@
 #ifndef TRUE
 #define TRUE (!FALSE)
 #endif
+#include <limits.h>
+#include <stdarg.h>
 typedef unsigned int ULONG;
 typedef unsigned char BYTE;
 typedef int BOOL;
 #define MAX_PATH PATH_MAX
-#include <limits.h>
-#include <stdarg.h>
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
 #endif //_WIN32
 
 // Misc C-runtime library headers
diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
index fe1fd8a9..f2a7b758 100644
--- a/dlls/rpg.cpp
+++ b/dlls/rpg.cpp
@@ -535,6 +535,9 @@ void CRpg::UpdateSpot( void )
 #ifndef CLIENT_DLL
 	if( m_fSpotActive )
 	{
+		if (m_pPlayer->pev->viewmodel == 0)
+			return;
+
 		if( !m_pSpot )
 		{
 			m_pSpot = CLaserSpot::CreateSpot();
diff --git a/dlls/wscript b/dlls/wscript
index b1c8cffa..5fb8dc02 100644
--- a/dlls/wscript
+++ b/dlls/wscript
@@ -68,5 +68,5 @@ def build(bld):
 		use      = libs,
 		install_path = install_path,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
-		idx      = 2
+		idx      = bld.get_taskgen_count()
 	)
diff --git a/wscript b/wscript
index f3b268f0..937de04a 100644
--- a/wscript
+++ b/wscript
@@ -13,6 +13,12 @@ top = '.'
 
 Context.Context.line_just = 55 # should fit for everything on 80x26
 
+@Configure.conf
+def get_taskgen_count(self):
+	try: idx = self.tg_idx_count
+	except: idx = 0 # don't set tg_idx_count to not increase counter
+	return idx
+
 def options(opt):
 	grp = opt.add_option_group('Common options')