Adjust TODO's.