Fixes to topic analysis errors