Additional metadata tweaks

...to bring model in line with upstream definitions.