Two more fixes (again thanks @cfaessler)