fixes to class merge