A bunch of fixes
Fix manifest file wrong include name