Properly focus shell & timeout for waits increased