Profiles & Teams Fixes