Fix TODO's added.