Update several TODOs