Resolved some TODOs.