Small bug fixes around pauldron changes