Fix device errors

Fixes for #375 (closed) #369

I messed up the previous merge request with commits not related to this issue (sorry), so I opened this with a different source branch.