diff --git a/Source/Client/Nightvision.c b/Source/Client/Nightvision.c
index 8d507b07..551818f0 100755
--- a/Source/Client/Nightvision.c
+++ b/Source/Client/Nightvision.c
@@ -59,7 +59,7 @@ void Nightvision_PreDraw( void ) {
 	}
 	
 	if ( iNightVision == TRUE ) {
-		dynamiclight_add( getproperty( VF_ORIGIN ), 500, '0 0.45 0');
+		dynamiclight_add( pSeat->vPlayerOrigin, 500, '0 0.45 0');
 	}
 }
 
diff --git a/Source/Client/View.c b/Source/Client/View.c
index 991c1462..febc098f 100755
--- a/Source/Client/View.c
+++ b/Source/Client/View.c
@@ -144,7 +144,7 @@ void View_DrawViewModel( void ) {
 	}
 
 	// Don't update when paused
-	if ( serverkey("pausestate") == "0" ) {
+	if ( serverkey( "pausestate" ) == "0" ) {
 		View_CalcBob();
 
 		int aw = getstati( STAT_ACTIVEWEAPON );
@@ -197,7 +197,7 @@ void View_DrawViewModel( void ) {
 		// Update muzzleflash position and draw it
 		if ( eMuzzleflash.alpha > 0.0f ) {
 			eMuzzleflash.origin = gettaginfo( eViewModel, eMuzzleflash.skin );
-			dynamiclight_add( eMuzzleflash.origin, 400 * eMuzzleflash.alpha, '1 0.45 0');
+			dynamiclight_add( pSeat->vPlayerOrigin, 400 * eMuzzleflash.alpha, '1 0.45 0');
 			addentity( eMuzzleflash );
 		}
 		
diff --git a/Source/Shared/Weapons.c b/Source/Shared/Weapons.c
index c010782f..26990d72 100755
--- a/Source/Shared/Weapons.c
+++ b/Source/Shared/Weapons.c
@@ -173,6 +173,7 @@ void Weapon_Reload( float fWeapon ) {
 	if ( self.fAttackFinished > time ) {
 		return;
 	}
+	self.viewzoom = 1.0;
 #endif
 #ifdef CSQC
 	if ( fWeaponEventPlayer != player_localentnum || autocvar_cl_thirdperson == TRUE ) {
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index 95caaa90..1e457d61 100644
Binary files a/freecs/csprogs.dat and b/freecs/csprogs.dat differ
diff --git a/freecs/progs.dat b/freecs/progs.dat
index ab06f2f4..cce683fb 100644
Binary files a/freecs/progs.dat and b/freecs/progs.dat differ