[DF-4476] More fixed after review