Some fixes, still buggy on boot to offline and "wifi"-runs