Fixed Ore issues