Manifest issues resolved