Increase connection timeout and handle lock better in poll mode.