MLDS-325 MLDS-450 Fix class ref warnings