Backport profile fixes