misc transfer related bug fixes