Fix some TODO notes.