Fix bugs in the manifest