topic fixes