More updates to allow guest-install without backnet