Fix more issues on manifest