[Manifest] some fixes