Barbarian adjustments

See: https://github.com/Thalassicus/cep-bnw/issues/220