[DF-2671] Additional fix. small corrections.