Add timeouts to wait longer