Fixed Manifest issues