File follow up bugs for these TODOs and add the bug # here