Fixes to prevent offline (timeout 2mins);