Fix some transfer issues