Various fixes for grizzly manifests 

This is work in progress...