Update metadata encoding
Tweak the manifest a bit