Ore registration fixes