diff --git a/cgame/cg_ents.cpp b/cgame/cg_ents.cpp
index cbbe6aca..c93ebb88 100644
--- a/cgame/cg_ents.cpp
+++ b/cgame/cg_ents.cpp
@@ -1309,8 +1309,12 @@ static void CG_General( centity_t *cent ) {
 
 			if ( curTimeDif < 3400 ) {
 				if ( lightSide ) {
-					if ( curTimeDif < 2200 ) { //probably temporary
-						trap->S_StartSound( NULL, cent->currentState.number, CHAN_AUTO, trap->S_RegisterSound( "sound/weapons/saber/saberhum1.wav" ) );
+					if ( curTimeDif < 2200
+						&& cg.frametime > 0
+						&& ((cg.frametime < 50 && cg.time % 50 <= cg.frametime)
+						|| cg.frametime >= 50))  //probably temporary
+					{
+						trap->S_StartSound(NULL, cent->currentState.number, CHAN_AUTO, trap->S_RegisterSound("sound/weapons/saber/saberhum1.wav"));
 					}
 				}
 				else { //probably temporary as well
@@ -1324,7 +1328,11 @@ static void CG_General( centity_t *cent ) {
 					else {
 						ent.customShader = media.gfx.world.electricBody2;
 					}
-					if ( random() > 0.9f ) {
+					if (( random() > 0.9f )
+						&& cg.frametime > 0
+						&& ((cg.frametime < 50 && cg.time % 50 <= cg.frametime)
+						|| cg.frametime >=50))
+					{
 						trap->S_StartSound( NULL, cent->currentState.number, CHAN_AUTO, media.sounds.environment.crackle );
 					}
 					SE_R_AddRefEntityToScene( &ent, cent->currentState.number );
diff --git a/cgame/cg_media.cpp b/cgame/cg_media.cpp
index 73957c24..565be496 100644
--- a/cgame/cg_media.cpp
+++ b/cgame/cg_media.cpp
@@ -273,7 +273,7 @@ static const resource_t gfx[] = {
 	{ &media.gfx.interface.automap.frameLeft, "gfx/mp_automap/mpauto_frame_left", RFL_NOMIP, GTB_SIEGE },
 	{ &media.gfx.interface.automap.frameRight, "gfx/mp_automap/mpauto_frame_right", RFL_NOMIP, GTB_SIEGE },
 	{ &media.gfx.interface.automap.frameTop, "gfx/mp_automap/mpauto_frame_top", RFL_NOMIP, GTB_SIEGE },
-	{ &media.gfx.interface.automap.playerIcon, "gfx/menus/radar/arrow_w", RFL_NOMIP, GTB_SIEGE },
+	{ &media.gfx.interface.automap.playerIcon, "gfx/menus/radar/arrow_w", RFL_NOMIP, GTB_ALL },
 	{ &media.gfx.interface.automap.rocketIcon, "gfx/menus/radar/rocket", RFL_NOMIP, GTB_SIEGE },
 	{ &media.gfx.interface.binoculars.arrow, "gfx/2d/binSideArrow", RFL_NOMIP, GTB_ALL },
 	{ &media.gfx.interface.binoculars.circle, "gfx/2d/binCircle", RFL_NOMIP, GTB_ALL },