[DF-5514] Compilation fixes