More tweaks for connectivity.