Fixing Manifest and setup