Further yaml metadata improvements.