Ore fixes
Merge pull request #1261 from Iamgoofball/orefixes

Ore fixes