Made pipes safe for base-4.6.0