Try harder to find devices

Fix #1101