Fix builds
Add comments to manifests