Enable --force-broken, and small cleanup of the manifest