Fixed:
- Minor fixes in imports

Remain problems:
- A lot of triggers from no connectivity to connectivity mode.