Two more minor bug fixes