Fix rebranding issues