Armories and shotguns fixed

#980