diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index 379ad3c4b1..fde20a48d2 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -1376,11 +1376,10 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid
             return;
         }
 
-        *parameter_1 = 0;
-        *parameter_1 |= (tile_element->properties.path.type & (FOOTPATH_PROPERTIES_FLAG_IS_SLOPED | FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK)) << 8;
+        *parameter_1 = (tile_element->properties.path.type & (FOOTPATH_PROPERTIES_FLAG_IS_SLOPED | FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK)) << 8;
         *parameter_2 = tile_element->base_height;
         *parameter_2 |= ((footpath_element_get_type(tile_element)) << 8);
-        if (footpath_element_has_queue_banner(tile_element)) {
+        if (footpath_element_is_queue(tile_element)) {
             *parameter_2 |= LOCATION_NULL;
         }
         *parameter_3 = (selected_scenery & 0xFF) + 1;
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index 908b911d41..06184f60ac 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -51,7 +51,7 @@ typedef struct GameAction GameAction;
 // This define specifies which version of network stream current build uses.
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
-#define NETWORK_STREAM_VERSION "24"
+#define NETWORK_STREAM_VERSION "25"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 #ifdef __cplusplus
diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c
index cbae86377e..0b19fdac89 100644
--- a/src/openrct2/world/footpath.c
+++ b/src/openrct2/world/footpath.c
@@ -270,7 +270,11 @@ static money32 footpath_element_insert(sint32 type, sint32 x, sint32 y, sint32 z
 
 static money32 footpath_element_update(sint32 x, sint32 y, rct_tile_element *tileElement, sint32 type, sint32 flags, uint8 pathItemType)
 {
-    if (footpath_element_get_type(tileElement) != (type & 0x0F) || (tileElement->type & FOOTPATH_ELEMENT_TYPE_FLAG_IS_QUEUE) != (type >> 7)) {
+    const sint32 newFootpathType = (type & (FOOTPATH_PROPERTIES_TYPE_MASK >> 4));
+    const bool   newPathIsQueue  = ((type >> 7) == 1);
+
+    if (footpath_element_get_type(tileElement) != newFootpathType ||
+        footpath_element_is_queue(tileElement) != newPathIsQueue) {
         gFootpathPrice += MONEY(6, 00);
     } else if (pathItemType != 0) {
         if (