Changes to pass t/manifest.t #2