fix some breakage with topics