OreDict Fixes