Fixed bugs in weapon deletion.