More TODO and FIXME comments.