- Fix more problems in transfer code (thanks Tholo!)