Profile management fixes