Fix topics for older versions