Resolve some TODOs