Fix undocumented API change, add TODO list