Fix manifest xmls

I am still working on stuff in this area - so don't merge this yet.