Some cleanups and extended the timeout