Fixed storage barrel collision being more complex than necessary, not convex, and breaking Tugboats