Fix issues from transferring the design