fix ism replacement and manifest gen issues