diff --git a/graphics/Achievements/MxWorldwide.png b/graphics/Achievements/MxWorldwide.png
new file mode 100644
index 000000000..c92b53487
Binary files /dev/null and b/graphics/Achievements/MxWorldwide.png differ
diff --git a/language.version b/language.version
index dd8d6b161..d24f2ddee 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \cwGZ\c- r416 (Sat 11 Jul 20:12:53 CEST 2020)";
+SWWM_MODVER="\chSWWM \cwGZ\c- r416 (Wed 15 Jul 10:19:57 CEST 2020)";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 27940f8a1..3042bf9ea 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -763,7 +763,7 @@ Class Demolitionist : PlayerPawn
 			}
 			else guideangle += .2*player.cmd.yaw*(360./65536.);
 			guidepitch -= .2*player.cmd.pitch*(360./65536.);
-			if ( !fly6dof ) fly6dof = CVar.GetCVar('swwm_fly6dof',players[consoleplayer]);
+			if ( !fly6dof ) fly6dof = CVar.GetCVar('swwm_fly6dof',player);
 			if ( player.centering ) guidepitch = clamp(deltaangle(pitch,0),-3.,3.);
 			if ( player.centering || !fly6dof.GetBool() ) guideroll = clamp(deltaangle(roll,0),-3.,3.);
 			if ( fly6dof.GetBool() )
@@ -1416,7 +1416,7 @@ Class Demolitionist : PlayerPawn
 	}
 	override bool Used( Actor user )
 	{
-		if ( !(user is 'Demolitionist') || !user.player ) return false;
+		if ( !(user is 'Demolitionist') || !player || (player.mo != self) ) return false;
 		if ( (user.player == players[consoleplayer]) && (health > 0) )
 		{
 			SWWMHandler.AddOneliner("greet",2);