Brand Migration Tool fixes