[DF-185] Compilation fixex