Amber Blade

I haven't seen this mentioned yet, but the mastery bonuses seem to be bugged. In my first game I started as a guardian and then went to watchman as my prestige class. I got my +3 STR as a guardian, but then when I switched classes I should have gotten +3 CON, which I didn't. The bonus eventually got switched to the correct one, but it wasn't until I had spent some time as a watchman. In my second game I didn't have this problem with my PC (sentinal/weapon master). The bonus switched right when it was supposed to. However, I've turned Bao-Dur into a jedi, he has full light-side mastery, it says above his character portrait "+3 STR", but it's not showing up in his stats. I tried entering a different area, he still doesn't get the bonus. I thought maybe he'd get it on his next level-up, nothing. I guess if I just keep waiting, it'll eventually pop up on there, but this is incredibly frustrating