MLDS-22 Fix minor consistency issues