UD-244: Some changes fixed