switch to thin-manifests, fix manifests