Completed some TODOs.