Changes to fix Nick

- Add device if not there
- Ignore issues with extra segments