fix some manifest merging
fix a compilation warning