More fixing of profile.d logic.