Brawler, Slayer, Swashbuckler fixes