Two more issues discovered (and documented)