Two more alias fixes.