additional weapon inheritance fixes
