Minor network fixes and wait until clone completes