Setting better timeout limits