Fixed various things to make topic add work