[DF-185] Compilation fixes