PB+SWMH tribal fixes