Two more small bugfixes from the previous batch