Fixed some TODOs