Fixes to topic.rb