fixes to class metadata