Tweak to adapt to ore dict changes