connectivity fixes