MLDS-857 Minor updates based on feedback