Updating a few FIXME comments.