Two more changes for master