Fixes for mixed case DwC terms and 'class' term