Some metadata improvements.