Fix a couple TODO's