Fixes related to issue #13. In the end, we listed devices wrongly.