pipe/cannon fixes