Fixes intermittent crash in Transfer(), and fixes not working after Data...

Fixes intermittent crash in Transfer(), and fixes not working after DataContext changed.