Correct mistakes in topics refactor