Added two TODOs.