Fixed barrel issues