Fix TODOs in project