Schema fixes for CV measures