diff --git a/cmake/web/assets/common.css b/cmake/web/assets/common.css
index 2c5762568..1b5d56036 100644
--- a/cmake/web/assets/common.css
+++ b/cmake/web/assets/common.css
@@ -23,6 +23,7 @@ canvas {
   width: 100%;
   height: 100%;
 }
+
 .center-container {
   position: absolute;
   text-align: center;
@@ -66,3 +67,11 @@ canvas {
   from {transform: rotate(0deg);}
   to {transform: rotate(360deg);}
 }
+
+canvas:focus {
+    outline: none;
+}
+
+* {
+    outline: none !important;
+}
diff --git a/hypersomnia/content/menu/tutorial/tutorial.json b/hypersomnia/content/menu/tutorial/tutorial.json
index 51c192e6e..0292a8621 100644
--- a/hypersomnia/content/menu/tutorial/tutorial.json
+++ b/hypersomnia/content/menu/tutorial/tutorial.json
@@ -13558,7 +13558,7 @@
             "ambience_particles": {
                 "scale_amounts": 0.30000001192092896
             },
-            "context_tip": "Yellow ones are the cheapest - they only drain stamina and throw enemies away.\nThey also force gun ignition  - good for trolling rocket launcher users."
+            "context_tip": "Yellow ones drain stamina and throw enemies away.\nThey also force gun ignition - great against rocket launchers."
         },
         {
             "id": "entry13",
diff --git a/src/application/setups/test_scene_setup.cpp b/src/application/setups/test_scene_setup.cpp
index 3ece94bb3..aa457524f 100644
--- a/src/application/setups/test_scene_setup.cpp
+++ b/src/application/setups/test_scene_setup.cpp
@@ -754,8 +754,15 @@ bool test_scene_setup::post_solve(const const_logic_step step) {
 
 		init(test_scene_type::SHOOTING_RANGE);
 
-		character().get<components::crosshair>() = pre_crosshair;
-		character().get<components::movement>().flags = pre_movement_flags;
+		if (const auto ch = character()) {
+			if (const auto cr = ch.find<components::crosshair>()) {
+				*cr = pre_crosshair;
+			}
+
+			if (const auto mv = ch.find<components::movement>()) {
+				mv->flags = pre_movement_flags;
+			}
+		}
 	}
 
 	return false;