Corrected some TODOs.