Fix more Manifest types.