[DF-1294] Fix warnings and after-merge issue