Manifest fix after merges