Added some removed TODOs