Two more OGR-28 related changes