Finished fixing topic bugs