diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index 210602bbd1..e8406d87ff 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -334,7 +334,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list(
 
 				var/obj/item/pipe/P = new pipe_item_type(A, queued_p_type, queued_p_dir)
 
-				if(queued_p_flipped)
+				if(queued_p_flipped && istype(P, /obj/item/pipe/trinary/flippable))
 					var/obj/item/pipe/trinary/flippable/F = P
 					F.flipped = queued_p_flipped
 
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 58846dc839..6cf9cec361 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -73,6 +73,8 @@
 	anchored = FALSE
 	connected_port.connected_device = null
 	connected_port = null
+	pixel_x = 0
+	pixel_y = 0
 	return TRUE
 
 /obj/machinery/portable_atmospherics/portableConnectorReturnAir()