Manifest: Review fixes (will AMEND)