Fixes

@jlipps added timeout before first check, it seems to reduce Safari flakiness.