Trying to fix errors cause by Manifest