Fix Manifest issues.