Additional fixes and re-branding