Manifest: Make it proper