manifest: more fixes

Change-Id: I2a07c4750eb5c900ff35f19ecf4aba1f77ad5b15