[DF-2617] Fixes according to review