- Fix Manifest
- Fix warnings