Make topic stuff more consistent