MLDS-27 Minor updates