Minor changes to transfer logic