Overlap fixes in Totem

* Fix Totem overlap with beampipe