@gvaish Manifest fixes based on lastest recommendations by the manifest-editor.