Fixes per Benny's review

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Nail down which deviceid is being used

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>