fixes related to transfer