Fix for storages and equip

Fixes #6076 and so on