Resolve some lingering TODOs