- Added a tad more checks for USB connected devices (again quick hack, but should work)
- More iDevice checks