Fixes to weapon bar