minor changes while troubleshooting connectivity issue