Fix immigrate issues