Two more bugs