diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm
index 11a879b2482..4b857cfc36b 100644
--- a/code/ATMOSPHERICS/he_pipes.dm
+++ b/code/ATMOSPHERICS/he_pipes.dm
@@ -8,6 +8,11 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 	minimum_temperature_difference = 20
 	thermal_conductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
 
+	// BubbleWrap
+	New()
+		..()
+		initialize_directions_he = initialize_directions	// The auto-detection from /pipe is good enough for a simple HE pipe
+	// BubbleWrap END
 
 	initialize()
 		normalize_dir()
@@ -59,6 +64,24 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
 	minimum_temperature_difference = 300
 	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
 
+	// BubbleWrap
+	New()
+		.. ()
+		switch ( dir )
+			if ( SOUTH )
+				initialize_directions = NORTH
+				initialize_directions_he = SOUTH
+			if ( NORTH )
+				initialize_directions = SOUTH
+				initialize_directions_he = NORTH
+			if ( EAST )
+				initialize_directions = WEST
+				initialize_directions_he = EAST
+			if ( WEST )
+				initialize_directions = EAST
+				initialize_directions_he = WEST
+	// BubbleWrap END
+
 	update_icon()
 		if(node1&&node2)
 			icon_state = "intact"
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index eabfdd003ab..c802fcad1c8 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -51,7 +51,7 @@
 	if(!charging || (stat & (BROKEN|NOPOWER)) )
 		return
 
-	var/added = charging.give(500)
+	var/added = charging.give(75)
 	use_power(added / CELLRATE)
 
-	updateicon()
\ No newline at end of file
+	updateicon()