What about these two TODOs?