Two more small optimizations