Two more style issues