Fix TODO's