Fix device searching. Everything working on OS X