Rebranding and fixes