Changes to weapon safe