DF-5375 fixed warrings