Manifest fixes