Small fix for TODO's and EDGE_CASE's