PB+SWMH fixes
Fighter trait fix
DIP/fighter traits fix