Two more fixes