Fix some weapon creation issues.