More weapon changes