Add some temporary Async.waits to makes things go