A few job profile fixes and cleanup.