diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp
index 91c0934d..979b7a66 100644
--- a/dlls/crossbow.cpp
+++ b/dlls/crossbow.cpp
@@ -407,7 +407,7 @@ class CCrossbowAmmo : public CBasePlayerAmmo
 	}
 	BOOL AddAmmo( CBaseEntity *pOther )
 	{ 
-		if( pOther->GiveAmmo( AMMO_BOLTGUN_GIVE, "bolts", BOLT_MAX_CARRY ) != -1 )
+		if( pOther->GiveAmmo( AMMO_BOLTGUN_GIVE, "bolts", BOLTGUN_MAX_CARRY ) != -1 )
 		{
 			EMIT_SOUND( ENT( pev ), CHAN_ITEM, "items/9mmclip1.wav", 1, ATTN_NORM );
 			return TRUE;
diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
index 34630d07..4739635a 100644
--- a/dlls/rpg.cpp
+++ b/dlls/rpg.cpp
@@ -331,7 +331,7 @@ void CRpg::Spawn()
 	SET_MODEL( ENT( pev ), "models/wmodels/w_rocketl.mdl" );
 	m_fSpotActive = 1;
 
-	m_iDefaultAmmo = RPG_DEFAULT_GIVE;
+	m_iDefaultAmmo = ROCKETL_DEFAULT_GIVE;
 
 	FallInit();// get ready to fall down.
 }
@@ -468,7 +468,7 @@ void CRpg::PrimaryAttack()
 
 void CRpg::SecondaryAttack()
 {
-	if( g_pGameRules->IsRocketArena() == 0 )
+	//if( g_pGameRules->IsRocketArena() == 0 )
 	{
 		m_fSpotActive = !m_fSpotActive;
 
@@ -481,7 +481,7 @@ void CRpg::SecondaryAttack()
 #endif
 		m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.2;
 	}
-	else
+	/*else
 	{
 		if( m_pPlayer->m_rgAmmo[m_iSecondaryAmmoType] )
 		{
@@ -528,7 +528,7 @@ void CRpg::SecondaryAttack()
 				m_pPlayer->pev->punchangle.x -= 5;
 			}
 		}
-	}
+	}*/
 }
 
 void CRpg::WeaponIdle( void )
diff --git a/dlls/squeakgrenade.cpp b/dlls/squeakgrenade.cpp
index 74d1c7b9..113c456c 100644
--- a/dlls/squeakgrenade.cpp
+++ b/dlls/squeakgrenade.cpp
@@ -96,7 +96,7 @@ TYPEDESCRIPTION	CSqueakGrenade::m_SaveData[] =
 
 IMPLEMENT_SAVERESTORE( CSqueakGrenade, CGrenade )
 
-#define SQUEEK_DETONATE_DELAY	15.0
+#define CHUMTOAD_DETONATE_DELAY	15.0
 
 int CSqueakGrenade::Classify( void )
 {
diff --git a/dlls/weapons.h b/dlls/weapons.h
index 5b4b7b5a..bc755876 100644
--- a/dlls/weapons.h
+++ b/dlls/weapons.h
@@ -745,6 +745,7 @@ public:
 	int m_fSpotActive;
 	int m_cActiveRockets;// how many missiles in flight from this launcher right now?
 
+	int rocket_load;
 	virtual BOOL UseDecrement( void )
 	{ 
 #if defined( CLIENT_WEAPONS )