Fix other missing topics as well