Fix some weapon stuff bugs