Add fixes for the manifest handling