Some small changes after transfer