Fix to TopicBuilder and some data files.