DF-1939. Fix some warnings