Include device source and destination
Fixes for some multi-device bugs.