Ore Generation (Semi-)Fixes