Fixed issues from Career Servies