Added missing join.

Minor fixes. Adjusted timeout.