Loose connection issues

Other ZeWatch issues: