Fix issues brought by transfer