Embedded manifest support fix