Two more tweaks