Fix transfer bugs