Fix errors in manifest generation