manifest and setup corrections