Fix fire extinguisher not being fillable with the top off.
HE pipe fixes.