Another manifest fix and more