Resolve some TODO items