Fixes for existing files on topic create