Tweaks to reflect latest OreDict changes