Small todo changes.