diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp
index 9813cabc1e..0cdc3c011d 100644
--- a/src/openrct2-ui/windows/Transparency.cpp
+++ b/src/openrct2-ui/windows/Transparency.cpp
@@ -19,10 +19,10 @@
 #include <openrct2/actions/ParkSetDateAction.h>
 #include <openrct2/actions/SetCheatAction.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/network/network.h>
-#include <openrct2/peep/Staff.h>
 #include <openrct2/sprites.h>
 #include <openrct2/util/Util.h>
 #include <openrct2/world/Climate.h>
@@ -93,12 +93,6 @@ public:
     void OnOpen() override
     {
         widgets = window_transparency_main_widgets;
-        enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_SEE_THROUGH_RIDES) | (1ULL << WIDX_SEE_THROUGH_VEHICLES)
-            | (1ULL << WIDX_SEE_THROUGH_SCENERY) | (1ULL << WIDX_SEE_THROUGH_TREES) | (1ULL << WIDX_SEE_THROUGH_PATHS)
-            | (1ULL << WIDX_INVISIBLE_RIDES) | (1ULL << WIDX_INVISIBLE_VEHICLES) | (1ULL << WIDX_INVISIBLE_SCENERY)
-            | (1ULL << WIDX_INVISIBLE_TREES) | (1ULL << WIDX_INVISIBLE_PATHS) | (1ULL << WIDX_INVISIBLE_SUPPORTS)
-            | (1ULL << WIDX_INVISIBLE_GUESTS) | (1ULL << WIDX_INVISIBLE_STAFF) | (1ULL << WIDX_SEE_THROUGH_SUPPORTS);
-
         window_push_others_below(this);
 
         auto* w = window_get_main();
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index 64deb807ba..f23bff8305 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -2757,7 +2757,7 @@ void Peep::Paint(paint_session& session, int32_t imageDirection) const
     uint32_t imageId = baseImageId | TshirtColour << 19 | TrousersColour << 24 | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS;
     PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 11 }, { 0, 0, z + 5 });
 
-    auto* guest = As<Staff>();
+    auto* guest = As<Guest>();
     if (guest != nullptr)
     {
         if (baseImageId >= 10717 && baseImageId < 10749)
diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index 3519e52dbc..41d6ddd55f 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -2195,7 +2195,7 @@ void PaintTrack(paint_session& session, Direction direction, int32_t height, con
         return;
     }
 
-    if ((session->ViewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES) && (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES))
+    if ((session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES) && (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES))
         return;
 
     if ((!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex)