Fix two TODO's