Two more Python 3 fixes