Two more TODOs