misc bug fixes related to connection timeout test