Make profiles work better