Fixed some TODO's.