more barrel fixes