Finally get the manifest right