Weapon & shield focus
Fixes