Fix barrel handling
First part of exploding barrel handling