Added a few doc related TODOs