Two more fixes.