Minor todo changes.