Manifest issues fixed