Some profile fixes