More weapons changes