Fixes in weapons