Fixed up the TODO items.