Minor tweaks.
Set timeout to 60sec.